From afaba37df031676ecf9e15486e544adf5a0e69da Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 11 Nov 2025 18:03:34 +0300 Subject: [PATCH 01/22] add kanban-board page & columns & task components --- .../features/detail/detail.component.html | 37 ++++- .../features/detail/detail.component.ts | 10 +- .../office/projects/detail/detail.routes.ts | 11 ++ .../kanban-board/kanban-board.component.html | 76 ++++++++++ .../kanban-board/kanban-board.component.scss | 131 ++++++++++++++++++ .../kanban-board/kanban-board.component.ts | 92 ++++++++++++ .../detail/kanban-board/kanban-board.guard.ts | 36 +++++ .../kanban-board/kanban-board.resolver.ts | 26 ++++ .../kanban-board/kanban-board.service.ts | 24 ++++ .../kanban-board-actions.component.html | 17 +++ .../kanban-board-actions.component.scss | 45 ++++++ .../actions/kanban-board-actions.component.ts | 14 ++ .../kanban-board-sidebar.component.html | 11 ++ .../kanban-board-sidebar.component.scss | 15 ++ .../sidebar/kanban-board-sidebar.component.ts | 18 +++ .../work-section/work-section.component.html | 8 +- .../work-section/work-section.component.ts | 9 +- .../src/assets/icons/svg/arrow-wide.svg | 3 + .../src/assets/icons/svg/calendar.svg | 3 + .../assets/icons/symbol/svg/sprite.css.svg | 2 +- .../social_platform/src/styles/_colors.scss | 7 +- 21 files changed, 580 insertions(+), 15 deletions(-) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.guard.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts create mode 100644 projects/social_platform/src/assets/icons/svg/arrow-wide.svg create mode 100644 projects/social_platform/src/assets/icons/svg/calendar.svg diff --git a/projects/social_platform/src/app/office/features/detail/detail.component.html b/projects/social_platform/src/app/office/features/detail/detail.component.html index d354d0ab..d032d733 100644 --- a/projects/social_platform/src/app/office/features/detail/detail.component.html +++ b/projects/social_platform/src/app/office/features/detail/detail.component.html @@ -308,10 +308,18 @@ - @if (isInProject) { + @if (isKanbanBoardPage && isInProject) { + вернуться + } @else if (isInProject && !isKanbanBoardPage) { @@ -334,6 +342,15 @@ > написать + } @else if (isKanbanBoardPage) { + + диаграмма ганта + } @else { + @if (isKanbanBoardPage) { + + контрольные точки + + } @else { команда - - @if (isInProject) { @if (profile) { @if (profile.id === info().leader) { + } @if (isInProject) { @if (isKanbanBoardPage) { + + статистика + + } @else { @if (profile) { @if (profile.id === info().leader) { выйти из проекта - } } + } } }
+ +
+
+ @if (projectBoardInfo(); as projectBoardInfo) { + + } @for (boardColumn of boardColumns(); track $index) { +
+
+

{{ boardColumn.tasks.length }}

+
+ @if (boardColumn.locked) { + + } +

{{ boardColumn.name }}

+
+ +
+ +
+ @for (task of boardColumn.tasks; track task.id) { +
+
+ {{ task.title }} +

{{ task.description ?? "" }}

+
+
+
+ + +
+ +
+ + +
+
+ +
+ + +
+
+ +
+
+ +

+ 04.04.2026 +

+
+ + #аналитика + выход на рынок для чего +
+
+ +
+
+ +
+
+ } +
+ + +
+ } +
+
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss new file mode 100644 index 00000000..fd75a40d --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -0,0 +1,131 @@ +.kanban { + &__wrapper { + display: grid; + grid-template-columns: 1fr 3fr 3fr 3fr; + grid-gap: 20px; + } + + &__column { + i, p { + color: var(--accent); + cursor: pointer; + } + + &--locked { + display: flex; + align-items: center; + gap: 5px; + } + + &--header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 5px 12px; + border-radius: var(--rounded-xl); + border: 0.5px solid var(--accent); + } + + &--add-task { + display: flex; + justify-content: center; + align-items: center; + align-self: center; + margin-top: 20px; + } + } + + &__tasks { + display: flex; + flex-direction: column; + align-items: center; + gap: 20px; + margin-top: 20px; + } + + &__task { + display: flex; + gap: 10px; + padding: 12px; + width: 100%; + max-width: 245px; + border-radius: var(--rounded-lg); + border: 0.5px solid var(--medium-grey-for-outline); + + &--left { + display: flex; + flex-direction: column; + gap: 5px; + align-items: flex-start; + } + + &--right { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + } + + &--mid { + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + } + + &--priority { + width: 6px; + height: 6px; + border-radius: var(--rounded-xxl); + } + + &--deadline, &--bottom { + display: flex; + align-items: center; + gap: 2px; + + p { + color: var(--accent) !important; + } + + ::ng-deep { + app-tag { + .tag { + padding: 2px 10px; + } + } + } + } + + &--people { + display: flex; + align-items: center; + gap: 3px; + align-items: flex-start; + } + + &--responsible, &--performers, &--deadline { + display: flex; + align-items: center; + gap: 2px; + + i { + min-width: 6px; + } + } + + &--icons { + display: flex; + align-items: center; + gap: 5px; + } + + span { + color: var(--black); + } + + p { + color: var(--grey-for-text); + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts new file mode 100644 index 00000000..58af6772 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -0,0 +1,92 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; +import { Subscription } from "rxjs"; +import { ProjectDataService } from "../services/project-data.service"; +import { Project } from "@office/models/project.model"; +import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; +import { ActivatedRoute } from "@angular/router"; +import { IconComponent, ButtonComponent } from "@ui/components"; +import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { TagComponent } from "@ui/components/tag/tag.component"; +import { EditorSubmitButtonDirective } from "@ui/directives/editor-submit-button.directive"; + +@Component({ + selector: "app-kanban-board", + templateUrl: "./kanban-board.component.html", + styleUrl: "./kanban-board.component.scss", + imports: [ + CommonModule, + KanbanBoardSidebarComponent, + IconComponent, + ButtonComponent, + AvatarComponent, + TagComponent, + EditorSubmitButtonDirective, + ], + standalone: true, +}) +export class KanbanBoardComponent implements OnInit, OnDestroy { + private readonly projectDataService = inject(ProjectDataService); + private readonly route = inject(ActivatedRoute); + private subscriptions: Subscription[] = []; + + projectBoardInfo = signal(null); + boardColumns = signal([]); + + ngOnInit(): void { + const projectInfo$ = this.projectDataService.project$.subscribe({ + next: project => { + if (project) { + this.projectBoardInfo.set(project); + } + }, + }); + + this.subscriptions.push(projectInfo$); + + const mockColumns = [ + { + id: 0, + name: "бэклог", + locked: true, + tasks: [ + { + id: 1, + title: "собрать требования", + description: + "Сейчас, чтобы создался аккаунт внтури скиллз, пользователю обязательно надо войти внутрь вкладки траектории и еще раз залогиниться...", + }, + { id: 2, title: "создать дизайн макеты" }, + ], + }, + { + id: 1, + locked: false, + name: "в работе", + tasks: [ + { id: 3, title: "настроить API" }, + { id: 4, title: "подключить WebSocket" }, + ], + }, + { + id: 2, + locked: false, + name: "Готово", + tasks: [ + { id: 5, title: "верстка страницы входа" }, + { id: 6, title: "настроить Dockerfile" }, + ], + }, + ]; + + this.boardColumns.set(mockColumns); + } + + ngOnDestroy(): void { + this.subscriptions.forEach($ => $.unsubscribe()); + } + + private buildColumns(): void {} +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.guard.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.guard.ts new file mode 100644 index 00000000..a2c87c6e --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.guard.ts @@ -0,0 +1,36 @@ +/** @format */ + +import { inject } from "@angular/core"; +import { ActivatedRouteSnapshot, CanActivateFn, Router, UrlTree } from "@angular/router"; +import { User } from "@auth/models/user.model"; +import { AuthService } from "@auth/services"; +import { Collaborator } from "@office/models/collaborator.model"; +import { ProjectService } from "@office/services/project.service"; +import { catchError, map, Observable, of, switchMap } from "rxjs"; + +export const KanbanBoardGuard: CanActivateFn = ( + route: ActivatedRouteSnapshot +): Observable => { + const router = inject(Router); + const projectService = inject(ProjectService); + const authService = inject(AuthService); + + const projectId = Number(route.parent?.params["projectId"]); + + if (!projectId) return of(router.createUrlTree([`/office/projects/${projectId}/`])); + + return authService.profile.pipe( + switchMap((user: User) => + projectService.getOne(projectId).pipe( + map(project => { + const isInProject = project.collaborators.some( + (collaborator: Collaborator) => collaborator.userId === user.id + ); + + return isInProject ? true : router.createUrlTree([`/office/projects/${projectId}`]); + }), + catchError(() => of(router.createUrlTree(["/office/projects"]))) + ) + ) + ); +}; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts new file mode 100644 index 00000000..71b0691b --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts @@ -0,0 +1,26 @@ +/** @format */ + +import { inject } from "@angular/core"; +import { KanbanBoardService } from "./kanban-board.service"; +import { ActivatedRouteSnapshot, Router } from "@angular/router"; +import { catchError, map, of } from "rxjs"; + +export const KanbanBoardResolver = (route: ActivatedRouteSnapshot): any => { + const kanbanBoardService = inject(KanbanBoardService); + const router = inject(Router); + + const projectId = Number(route.parent?.params["projectId"]); + if (!projectId) { + return of(router.createUrlTree(["/projects"])); + } + + // return kanbanBoardService.getBoardByProjectId(projectId).pipe( + // map((board: any) => ({ + // columns: board.columns, + // })), + // catchError((error) => { + // console.error('Error resolving Kanban board:', error); + // return of(router.createUrlTree(['/projects'])); + // }) + // ); +}; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts new file mode 100644 index 00000000..c67156a0 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts @@ -0,0 +1,24 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { ApiService } from "@corelib"; + +@Injectable({ + providedIn: "root", +}) +export class KanbanBoardService { + private readonly apiService = inject(ApiService); + private readonly KANBAN_BOARD_URL = ""; + + getBoardByProjectId(projectId: number) { + return this.apiService.get(`${this.KANBAN_BOARD_URL}/`); + } + + getTasksByColumnId(columnId: number) { + return this.apiService.get(`${this.KANBAN_BOARD_URL}/`); + } + + getTaskById(taskId: number) { + return this.apiService.get(`${this.KANBAN_BOARD_URL}/`); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html new file mode 100644 index 00000000..b821dd72 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html @@ -0,0 +1,17 @@ + + + +
+
+ +
+ +
+ +
+
+ +
+ +
+ diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss new file mode 100644 index 00000000..77fb1356 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss @@ -0,0 +1,45 @@ +.kanban { + &__sidebar { + &--item { + border-radius: var(--rounded-xxl); + padding: 12px; + display: flex; + align-self: center; + justify-content: center; + align-items: center; + cursor: pointer; + } + + &--add-project { + background-color: var(--light-white); + border: 0.5px solid var(--accent); + } + } + + &__actions { + display: flex; + flex-direction: column; + gap: 15px; + margin-bottom: 15px; + } +} + +.actions { + &__person { + background-color: var(--accent-light); + border: 0.5px solid var(--accent); + + i { + color: var(--accent); + } + } + + &__priority { + background-color: var(--green-light); + border: 0.5px solid var(--green); + + i { + color: var(--green); + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts new file mode 100644 index 00000000..5cd91570 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts @@ -0,0 +1,14 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component } from "@angular/core"; +import { IconComponent } from "@uilib"; + +@Component({ + selector: "app-kanban-board-actions", + templateUrl: "./kanban-board-actions.component.html", + styleUrl: "./kanban-board-actions.component.scss", + imports: [CommonModule, IconComponent], + standalone: true, +}) +export class KanbanBoardActionsComponent {} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html new file mode 100644 index 00000000..22056b21 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html @@ -0,0 +1,11 @@ + + +
+ @if (projectBoardInfo) { +
+ +
+ } + + +
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss new file mode 100644 index 00000000..96616bbb --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss @@ -0,0 +1,15 @@ +.kanban { + &__sidebar { + display: flex; + flex-direction: column; + align-items: center; + justify-content: flex-start; + height: 60vh; + max-height: 373px; + gap: 15px; + padding: 15px; + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + background-color: var(--light-white); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts new file mode 100644 index 00000000..39730f99 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts @@ -0,0 +1,18 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, Input } from "@angular/core"; +import { Project } from "@office/models/project.model"; +import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { KanbanBoardActionsComponent } from "../actions/kanban-board-actions.component"; + +@Component({ + selector: "app-kanban-board-sidebar", + templateUrl: "./kanban-board-sidebar.component.html", + styleUrl: "./kanban-board-sidebar.component.scss", + imports: [CommonModule, AvatarComponent, KanbanBoardActionsComponent], + standalone: true, +}) +export class KanbanBoardSidebarComponent { + @Input({ required: true }) projectBoardInfo!: Project; +} diff --git a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html b/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html index 2df97a01..d192016e 100644 --- a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html +++ b/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html @@ -8,9 +8,11 @@

мои задачи

- открыть доску задач + + открыть доску задач +
diff --git a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.ts b/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.ts index 8197bd5d..e1e743ef 100644 --- a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.ts @@ -5,7 +5,7 @@ import { Component, inject, OnDestroy, OnInit } from "@angular/core"; import { ButtonComponent } from "@ui/components"; import { IconComponent } from "@uilib"; import { map, Subscription } from "rxjs"; -import { ActivatedRoute } from "@angular/router"; +import { ActivatedRoute, RouterLink } from "@angular/router"; import { VacancyResponse } from "@office/models/vacancy-response.model"; import { VacancyService } from "@office/services/vacancy.service"; @@ -13,15 +13,16 @@ import { VacancyService } from "@office/services/vacancy.service"; selector: "app-work-section", templateUrl: "./work-section.component.html", styleUrl: "./work-section.component.scss", - imports: [CommonModule, IconComponent, ButtonComponent], + imports: [CommonModule, IconComponent, ButtonComponent, RouterLink], standalone: true, }) export class ProjectWorkSectionComponent implements OnInit, OnDestroy { private readonly route = inject(ActivatedRoute); private readonly vacancyService = inject(VacancyService); - private subscriptions: Subscription[] = []; + private readonly subscriptions: Subscription[] = []; vacancies: VacancyResponse[] = []; + projectId?: number; ngOnInit(): void { const vacanciesSub$ = this.route.data.pipe(map(r => r["data"])).subscribe({ @@ -33,6 +34,8 @@ export class ProjectWorkSectionComponent implements OnInit, OnDestroy { }); this.subscriptions.push(vacanciesSub$); + + this.projectId = this.route.parent?.snapshot.params["projectId"]; } ngOnDestroy(): void { diff --git a/projects/social_platform/src/assets/icons/svg/arrow-wide.svg b/projects/social_platform/src/assets/icons/svg/arrow-wide.svg new file mode 100644 index 00000000..d096f016 --- /dev/null +++ b/projects/social_platform/src/assets/icons/svg/arrow-wide.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/social_platform/src/assets/icons/svg/calendar.svg b/projects/social_platform/src/assets/icons/svg/calendar.svg new file mode 100644 index 00000000..4fe4af35 --- /dev/null +++ b/projects/social_platform/src/assets/icons/svg/calendar.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg index 0d291c46..fc716876 100644 --- a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg +++ b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/projects/social_platform/src/styles/_colors.scss b/projects/social_platform/src/styles/_colors.scss index 9deab347..9986d687 100644 --- a/projects/social_platform/src/styles/_colors.scss +++ b/projects/social_platform/src/styles/_colors.scss @@ -9,7 +9,8 @@ --accent: #8a63e6; --accent-dark: #{color.adjust(#8a63e6, $blackness: 20%)}; --accent-mild: #{color.adjust(#6c27ff, $alpha: -0.4)}; - --accent-light: #9a80e6; + --accent-light: #E8E0FA; + --accent-medium: #9764BA; // GOLD --gold: #e5b25d; @@ -28,7 +29,11 @@ // FUNCTIONAL --green: #88c9a1; + --green-light: #E3F0E8; --green-dark: #297373; --red: #d48a9e; --red-dark: #{color.adjust(#d48a9e, $blackness: 10%)}; + --blue-dark: #2F36AA; + --purple: #9a80e6; + --cyan: #4CD9F1; } From 42b4ca2c6d0c9bd2d2f4fae02cda4aa6553cd9f1 Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 11 Nov 2025 18:13:19 +0300 Subject: [PATCH 02/22] add styles for kanban-board, columns, tasks components --- .../kanban-board/kanban-board.component.scss | 34 +++++++++++-------- .../kanban-board-actions.component.scss | 6 ++-- .../kanban-board-sidebar.component.scss | 4 +-- .../social_platform/src/styles/_colors.scss | 10 +++--- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index fd75a40d..6cbf53f7 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -6,15 +6,16 @@ } &__column { - i, p { + i, + p { color: var(--accent); cursor: pointer; } &--locked { display: flex; - align-items: center; gap: 5px; + align-items: center; } &--header { @@ -22,15 +23,15 @@ align-items: center; justify-content: space-between; padding: 5px 12px; - border-radius: var(--rounded-xl); border: 0.5px solid var(--accent); + border-radius: var(--rounded-xl); } &--add-task { display: flex; - justify-content: center; align-items: center; align-self: center; + justify-content: center; margin-top: 20px; } } @@ -38,19 +39,19 @@ &__tasks { display: flex; flex-direction: column; - align-items: center; gap: 20px; + align-items: center; margin-top: 20px; } &__task { display: flex; gap: 10px; - padding: 12px; width: 100%; max-width: 245px; - border-radius: var(--rounded-lg); + padding: 12px; border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); &--left { display: flex; @@ -62,14 +63,14 @@ &--right { display: flex; flex-direction: column; - justify-content: space-between; align-items: center; + justify-content: space-between; } &--mid { display: flex; - justify-content: space-between; align-items: center; + justify-content: space-between; width: 100%; } @@ -79,10 +80,11 @@ border-radius: var(--rounded-xxl); } - &--deadline, &--bottom { + &--deadline, + &--bottom { display: flex; - align-items: center; gap: 2px; + align-items: center; p { color: var(--accent) !important; @@ -99,15 +101,17 @@ &--people { display: flex; - align-items: center; gap: 3px; + align-items: center; align-items: flex-start; } - &--responsible, &--performers, &--deadline { + &--responsible, + &--performers, + &--deadline { display: flex; - align-items: center; gap: 2px; + align-items: center; i { min-width: 6px; @@ -116,8 +120,8 @@ &--icons { display: flex; - align-items: center; gap: 5px; + align-items: center; } span { diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss index 77fb1356..b06ff549 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss @@ -1,13 +1,13 @@ .kanban { &__sidebar { &--item { - border-radius: var(--rounded-xxl); - padding: 12px; display: flex; + align-items: center; align-self: center; justify-content: center; - align-items: center; + padding: 12px; cursor: pointer; + border-radius: var(--rounded-xxl); } &--add-project { diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss index 96616bbb..70efd18d 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss @@ -2,14 +2,14 @@ &__sidebar { display: flex; flex-direction: column; + gap: 15px; align-items: center; justify-content: flex-start; height: 60vh; max-height: 373px; - gap: 15px; padding: 15px; + background-color: var(--light-white); border: 0.5px solid var(--medium-grey-for-outline); border-radius: var(--rounded-lg); - background-color: var(--light-white); } } diff --git a/projects/social_platform/src/styles/_colors.scss b/projects/social_platform/src/styles/_colors.scss index 9986d687..55149b82 100644 --- a/projects/social_platform/src/styles/_colors.scss +++ b/projects/social_platform/src/styles/_colors.scss @@ -9,8 +9,8 @@ --accent: #8a63e6; --accent-dark: #{color.adjust(#8a63e6, $blackness: 20%)}; --accent-mild: #{color.adjust(#6c27ff, $alpha: -0.4)}; - --accent-light: #E8E0FA; - --accent-medium: #9764BA; + --accent-light: #e8e0fa; + --accent-medium: #9764ba; // GOLD --gold: #e5b25d; @@ -29,11 +29,11 @@ // FUNCTIONAL --green: #88c9a1; - --green-light: #E3F0E8; + --green-light: #e3f0e8; --green-dark: #297373; --red: #d48a9e; --red-dark: #{color.adjust(#d48a9e, $blackness: 10%)}; - --blue-dark: #2F36AA; + --blue-dark: #2f36aa; --purple: #9a80e6; - --cyan: #4CD9F1; + --cyan: #4cd9f1; } From 41a71f7dd7da6638b7eb8684f6f3677c031bbee1 Mon Sep 17 00:00:00 2001 From: Awakich Date: Wed, 12 Nov 2025 17:39:17 +0300 Subject: [PATCH 03/22] add detail task, task, mapper for color priority --- .../consts/lists/priority-info-list.const.ts | 47 ++++ .../kanban-board/kanban-board.component.html | 214 ++++++++++++++---- .../kanban-board/kanban-board.component.scss | 153 ++++++++----- .../kanban-board/kanban-board.component.ts | 67 +++++- .../kanban-board-actions.component.html | 6 +- .../kanban-board-actions.component.scss | 6 +- .../kanban-board-sidebar.component.html | 2 +- .../shared/task/kanban-task.component.html | 53 +++++ .../shared/task/kanban-task.component.scss | 106 +++++++++ .../shared/task/kanban-task.component.ts | 39 ++++ .../project-vacancy-card.component.ts | 2 +- .../src/app/utils/helpers/hexToRgba.ts | 10 + 12 files changed, 598 insertions(+), 107 deletions(-) create mode 100644 projects/core/src/consts/lists/priority-info-list.const.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts create mode 100644 projects/social_platform/src/app/utils/helpers/hexToRgba.ts diff --git a/projects/core/src/consts/lists/priority-info-list.const.ts b/projects/core/src/consts/lists/priority-info-list.const.ts new file mode 100644 index 00000000..c9ddcc8d --- /dev/null +++ b/projects/core/src/consts/lists/priority-info-list.const.ts @@ -0,0 +1,47 @@ +/** + * Информация для приоритетов + * + * @format + * @field name - выбор в выпадающем списке + * @field color - цвет для определенного типа приоритета + * @field priorityType - значение (от 0 до 5), которое соотносится на бэке + */ + +export const priorityInfoList = [ + { + id: 0, + name: "бэклог", + color: "#322299", + priorityType: 0, + }, + { + id: 1, + name: "в ближайшие часы", + color: "#A63838", + priorityType: 1, + }, + { + id: 2, + name: "высокий", + color: "#D48A9E", + priorityType: 2, + }, + { + id: 3, + name: "средний", + color: "#E5B25D", + priorityType: 3, + }, + { + id: 4, + name: "низкий", + color: "#297373", + priorityType: 4, + }, + { + id: 5, + name: "улучшение", + color: "#88C9A1", + priorityType: 5, + }, +]; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html index 01b13486..10b9069e 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html @@ -1,14 +1,14 @@
-
+
@if (projectBoardInfo(); as projectBoardInfo) { } @for (boardColumn of boardColumns(); track $index) {
-
+

{{ boardColumn.tasks.length }}

-
+
@if (boardColumn.locked) { } @@ -19,57 +19,185 @@
@for (task of boardColumn.tasks; track task.id) { -
+ } +
+ + +
+ } @if (isTaskDetailOpen()) { +
+
+ прикрепить результат -
- {{ task.title }} -

{{ task.description ?? "" }}

-
-
-
- - -
- -
- - -
-
- -
- - -
+
+ +
+
+
+ +
+

Настроить процессы

+ +
+ +
+
+ +

Федор Е

+
+ +

12.10.2025 21:00

+
+ +
+
+
+ +
ответственный
+
+ +
+ +

Екатерина Ш

+
+
+ +
+
+ +
исполнители
+
+ +
+ +
+
+ +
+
+ +

начало

+
+ +
+

20.10.25

+ +
+

началась

+
+
+ +
+
+ +

дедлайн

+
-
-
- -

- 04.04.2026 -

-
+
+

25.10.25

- #аналитика - выход на рынок для чего +
+

10 дней

+
+
-
-
- +
+
+
+ +

тег

+ + #аналитика +
+ +
+
+ +

цель

+
+ + выход на рынок для... +
+ +
+
+ +

навыки

+
+ + word
- }
- +
+ +
+

+ @if (descriptionExpandable) { +
+ {{ readFullDescription ? "cкрыть" : "подробнее" }} +
+ } +
+ +
+ +
+ +
+ +
+
+ + + + + + +
+ @for (f of filesList; track f.id) { + + + } +
+
+ +
+
+
}
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index 6cbf53f7..89a91010 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -3,6 +3,7 @@ display: grid; grid-template-columns: 1fr 3fr 3fr 3fr; grid-gap: 20px; + position: relative; } &__column { @@ -12,13 +13,13 @@ cursor: pointer; } - &--locked { + &-locked { display: flex; gap: 5px; align-items: center; } - &--header { + &-header { display: flex; align-items: center; justify-content: space-between; @@ -44,92 +45,138 @@ margin-top: 20px; } - &__task { - display: flex; - gap: 10px; + &__detail { + position: absolute; + right: 0%; + top: 0%; width: 100%; - max-width: 245px; - padding: 12px; - border: 0.5px solid var(--medium-grey-for-outline); + max-width: 422px; + padding: 24px; border-radius: var(--rounded-lg); + border: 0.5px solid var(--medium-grey-for-outline); + background-color: var(--light-white); - &--left { - display: flex; - flex-direction: column; - gap: 5px; - align-items: flex-start; - } - &--right { + &-top { display: flex; - flex-direction: column; align-items: center; justify-content: space-between; - } + margin-bottom: 24px; - &--mid { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; + &-menu { + display: flex; + align-items: center; + gap: 10px; + } } - &--priority { - width: 6px; - height: 6px; + &-priority { + width: 15px; + height: 15px; border-radius: var(--rounded-xxl); + background-color: var(--green-dark); } - &--deadline, - &--bottom { + &-general { display: flex; - gap: 2px; align-items: center; + justify-content: space-between; + margin-bottom: 10px; + border-bottom: 0.5px solid var(--accent); + margin-bottom: 5px; p { color: var(--accent) !important; } - - ::ng-deep { - app-tag { - .tag { - padding: 2px 10px; - } - } - } } - &--people { + p {color: var(--grey-for-text);} + + &-info { display: flex; - gap: 3px; - align-items: center; align-items: flex-start; - } + gap: 10px; + margin-top: 15px; - &--responsible, - &--performers, - &--deadline { - display: flex; - gap: 2px; - align-items: center; + &-name { + display: flex; + align-items: center; + gap: 3px; + + &--date { + display: flex; + align-items: center; + gap: 3px; - i { - min-width: 6px; + p, i { + color: var(--green-dark) !important; + } + } + + h6 { + color: var(--accent); + } } } - &--icons { + &-info-wrapper { display: flex; + flex-direction: column; gap: 5px; - align-items: center; } - span { - color: var(--black); + i { + color: var(--accent); } + } +} +.about { + /* stylelint-disable value-no-vendor-prefix */ + &__text { p { - color: var(--grey-for-text); + display: -webkit-box; + overflow: hidden; + color: var(--black); + text-overflow: ellipsis; + -webkit-box-orient: vertical; + -webkit-line-clamp: 5; + transition: all 0.7s ease-in-out; + + &.expanded { + -webkit-line-clamp: unset; + } } + + ::ng-deep a { + color: var(--accent); + text-decoration: underline; + text-decoration-color: transparent; + text-underline-offset: 3px; + transition: text-decoration-color 0.2s; + + &:hover { + text-decoration-color: var(--accent); + } + } + } + + /* stylelint-enable value-no-vendor-prefix */ + + &__read-full { + margin-top: 2px; + color: var(--accent); + cursor: pointer; + } +} + +.read-more { + margin-top: 12px; + color: var(--accent); + cursor: pointer; + transition: color 0.2s; + + &:hover { + color: var(--accent-dark); } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts index 58af6772..67b86b27 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -6,11 +6,16 @@ import { Subscription } from "rxjs"; import { ProjectDataService } from "../services/project-data.service"; import { Project } from "@office/models/project.model"; import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; -import { ActivatedRoute } from "@angular/router"; -import { IconComponent, ButtonComponent } from "@ui/components"; +import { ActivatedRoute, Router } from "@angular/router"; +import { IconComponent, ButtonComponent, InputComponent } from "@ui/components"; +import { KanbanTaskComponent } from "./shared/task/kanban-task.component"; +import { ClickOutsideModule } from "ng-click-outside"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { TagComponent } from "@ui/components/tag/tag.component"; -import { EditorSubmitButtonDirective } from "@ui/directives/editor-submit-button.directive"; +import { expandElement } from "@utils/expand-element"; +import { ParseBreaksPipe, ParseLinksPipe } from "@corelib"; +import { FileItemComponent } from "@ui/components/file-item/file-item.component"; +import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; @Component({ selector: "app-kanban-board", @@ -20,22 +25,45 @@ import { EditorSubmitButtonDirective } from "@ui/directives/editor-submit-button CommonModule, KanbanBoardSidebarComponent, IconComponent, + KanbanTaskComponent, + ClickOutsideModule, ButtonComponent, AvatarComponent, TagComponent, - EditorSubmitButtonDirective, + ParseBreaksPipe, + ParseLinksPipe, + FileItemComponent, + InputComponent, + FileUploadItemComponent, ], standalone: true, }) export class KanbanBoardComponent implements OnInit, OnDestroy { private readonly projectDataService = inject(ProjectDataService); private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); private subscriptions: Subscription[] = []; projectBoardInfo = signal(null); boardColumns = signal([]); + isTaskDetailOpen = signal(false); + + descriptionExpandable!: boolean; // Флаг необходимости кнопки "Читать полностью" + readFullDescription = false; // Флаг показа всех вакансий + + filesList: any[] = []; ngOnInit(): void { + const detailInfoUrl$ = this.route.queryParams.subscribe({ + next: params => { + if (params["taskId"]) { + this.isTaskDetailOpen.set(true); + } + }, + }); + + this.subscriptions.push(detailInfoUrl$); + const projectInfo$ = this.projectDataService.project$.subscribe({ next: project => { if (project) { @@ -57,6 +85,7 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { title: "собрать требования", description: "Сейчас, чтобы создался аккаунт внтури скиллз, пользователю обязательно надо войти внутрь вкладки траектории и еще раз залогиниться...", + priority: 3, }, { id: 2, title: "создать дизайн макеты" }, ], @@ -88,5 +117,33 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.subscriptions.forEach($ => $.unsubscribe()); } - private buildColumns(): void {} + openDetailTask(taskId: number): void { + this.router.navigate([], { + queryParams: { + taskId, + }, + relativeTo: this.route, + queryParamsHandling: "merge", + }); + this.isTaskDetailOpen.set(true); + } + + closeDetailTask(): void { + this.router.navigate([], { + queryParams: {}, + replaceUrl: true, + }); + this.isTaskDetailOpen.set(false); + } + + /** + * Раскрытие/сворачивание описания профиля + * @param elem - DOM элемент описания + * @param expandedClass - CSS класс для раскрытого состояния + * @param isExpanded - текущее состояние (раскрыто/свернуто) + */ + onExpandDescription(elem: HTMLElement, expandedClass: string, isExpanded: boolean): void { + expandElement(elem, expandedClass, isExpanded); + this.readFullDescription = !isExpanded; + } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html index b821dd72..5a53c041 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html @@ -2,16 +2,16 @@
-
+
-
+
-
+
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss index b06ff549..778d0790 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss @@ -1,6 +1,6 @@ .kanban { &__sidebar { - &--item { + &-item { display: flex; align-items: center; align-self: center; @@ -13,6 +13,10 @@ &--add-project { background-color: var(--light-white); border: 0.5px solid var(--accent); + + i { + color: var(--accent); + } } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html index 22056b21..93f54a17 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html @@ -2,7 +2,7 @@
@if (projectBoardInfo) { -
+
} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html new file mode 100644 index 00000000..2447d881 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html @@ -0,0 +1,53 @@ + + +
+
+ {{ task.title }} + @if (task.description) { +

{{ task.description }}

+ } @if (task?.responsible || task?.performers?.length || task?.files?.length || task.action) { +
+
+ @if (task?.responsible) { +
+ + +
+ } @if (task?.performers?.length) { +
+ + +
+ } +
+ + @if (task?.files?.length || task?.action) { +
+ + +
+ } +
+ } @if (task?.deadline || task?.tag || task?.goal) { +
+ @if (task.deadline) { +
+ +

04.04.2026

+
+ } @if (task.tag) { + #аналитика + } @if (task.goal) { + выход на рынок для чего + } +
+ } +
+ +
+ @if (task.priority) { +
+ } + +
+
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss new file mode 100644 index 00000000..e4a1dd27 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss @@ -0,0 +1,106 @@ +:host { + width: 100%; +} + +.kanban { + &__task { + display: flex; + gap: 10px; + width: 100%; + max-width: 245px; + padding: 12px; + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + transition: opacity 0.2s ease-in; + cursor: pointer; + + &:hover { + opacity: 0.7; + } + + &-left { + display: flex; + flex-direction: column; + gap: 5px; + flex-grow: 1; + align-items: flex-start; + } + + &-right { + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + } + + &-mid { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + } + + &-priority { + width: 6px; + height: 6px; + border-radius: var(--rounded-xxl); + } + + &-deadline, + &-bottom { + display: flex; + gap: 2px; + align-items: center; + + p { + color: var(--accent) !important; + } + + ::ng-deep { + app-tag { + .tag { + padding: 2px 10px; + } + } + } + } + + &-people { + display: flex; + gap: 3px; + align-items: center; + align-items: flex-start; + } + + &-responsible, + &-performers, + &-deadline { + display: flex; + gap: 2px; + align-items: center; + + i { + min-width: 6px; + } + } + + &-icons { + display: flex; + gap: 5px; + align-items: center; + } + + span { + color: var(--black); + } + + p { + color: var(--grey-for-text); + } + + i { + color: var(--accent); + cursor: pointer; + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts new file mode 100644 index 00000000..438a7448 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts @@ -0,0 +1,39 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, Input } from "@angular/core"; +import { IconComponent } from "@uilib"; +import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { TagComponent } from "@ui/components/tag/tag.component"; +import { hexToRgba } from "@utils/helpers/hexToRgba"; +import { priorityInfoList } from "projects/core/src/consts/lists/priority-info-list.const"; + +@Component({ + selector: "app-kanban-task", + templateUrl: "./kanban-task.component.html", + styleUrl: "./kanban-task.component.scss", + imports: [CommonModule, IconComponent, AvatarComponent, TagComponent], + standalone: true, +}) +export class KanbanTaskComponent { + @Input({ required: true }) task: any; + + private readonly priorityInfoList = priorityInfoList; + private readonly hexToRgba = hexToRgba; + + getPriorityType(priorityId: number, type: "background" | "color", opacity = 0.25) { + const findedPriority = this.priorityInfoList.find( + priority => priority.priorityType === priorityId + ); + const baseColor = findedPriority?.color ?? "var(--light-white)"; + + if (!findedPriority) return; + + if (type === "color") { + return { "background-color": baseColor }; + } + + const rgbaColor = this.hexToRgba(baseColor, opacity); + return { "background-color": rgbaColor }; + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts b/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts index 104ec1a8..8dd59e13 100644 --- a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts @@ -57,7 +57,7 @@ export class ProjectVacancyCardComponent implements OnInit { } } - descriptionExpandable!: boolean; // Флаг необходимости кнопки "Читать полностью" + descriptionExpandable!: boolean; // Флаг необходимости кнопки "подробнее" readFullDescription = false; // Флаг показа всех вакансий endSliceOfSkills = 0; diff --git a/projects/social_platform/src/app/utils/helpers/hexToRgba.ts b/projects/social_platform/src/app/utils/helpers/hexToRgba.ts new file mode 100644 index 00000000..568c6c3a --- /dev/null +++ b/projects/social_platform/src/app/utils/helpers/hexToRgba.ts @@ -0,0 +1,10 @@ +/** @format */ + +export const hexToRgba = (hex: string, alpha: number): string => { + const [r, g, b] = hex + .replace(/^#/, "") + .match(/.{1,2}/g)! + .map(x => parseInt(x, 16)); + + return `rgba(${r}, ${g}, ${b}, ${alpha})`; +}; From c33a1f63ef41c37eb666547aff7610528dde822e Mon Sep 17 00:00:00 2001 From: Awakich Date: Wed, 12 Nov 2025 17:41:06 +0300 Subject: [PATCH 04/22] add styles for task-detail, task --- .../kanban-board/kanban-board.component.scss | 26 +++++++++---------- .../shared/task/kanban-task.component.scss | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index 89a91010..c54a45d6 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -1,9 +1,9 @@ .kanban { &__wrapper { + position: relative; display: grid; grid-template-columns: 1fr 3fr 3fr 3fr; grid-gap: 20px; - position: relative; } &__column { @@ -47,15 +47,14 @@ &__detail { position: absolute; - right: 0%; top: 0%; + right: 0%; width: 100%; max-width: 422px; padding: 24px; - border-radius: var(--rounded-lg); - border: 0.5px solid var(--medium-grey-for-outline); background-color: var(--light-white); - + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); &-top { display: flex; @@ -65,16 +64,16 @@ &-menu { display: flex; - align-items: center; gap: 10px; + align-items: center; } } &-priority { width: 15px; height: 15px; - border-radius: var(--rounded-xxl); background-color: var(--green-dark); + border-radius: var(--rounded-xxl); } &-general { @@ -82,33 +81,34 @@ align-items: center; justify-content: space-between; margin-bottom: 10px; - border-bottom: 0.5px solid var(--accent); margin-bottom: 5px; + border-bottom: 0.5px solid var(--accent); p { color: var(--accent) !important; } } - p {color: var(--grey-for-text);} + p { color: var(--grey-for-text); } &-info { display: flex; - align-items: flex-start; gap: 10px; + align-items: flex-start; margin-top: 15px; &-name { display: flex; - align-items: center; gap: 3px; + align-items: center; &--date { display: flex; - align-items: center; gap: 3px; + align-items: center; - p, i { + p, + i { color: var(--green-dark) !important; } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss index e4a1dd27..097af114 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss @@ -9,10 +9,10 @@ width: 100%; max-width: 245px; padding: 12px; + cursor: pointer; border: 0.5px solid var(--medium-grey-for-outline); border-radius: var(--rounded-lg); transition: opacity 0.2s ease-in; - cursor: pointer; &:hover { opacity: 0.7; @@ -21,8 +21,8 @@ &-left { display: flex; flex-direction: column; - gap: 5px; flex-grow: 1; + gap: 5px; align-items: flex-start; } From ce82961fe8ba35e3ffed5bef4861eff8450eaaa9 Mon Sep 17 00:00:00 2001 From: Awakich Date: Thu, 13 Nov 2025 17:29:32 +0300 Subject: [PATCH 05/22] filled & empty design of task-detail, models for kanban, badge component --- .../src/app/office/models/tag.model.ts | 7 + .../kanban-board/kanban-board.component.html | 182 ++++++++++++------ .../kanban-board/kanban-board.component.scss | 164 +++++++++++++++- .../kanban-board/kanban-board.component.ts | 65 ++++++- .../detail/kanban-board/models/board.model.ts | 6 + .../kanban-board/models/column.model.ts | 8 + .../kanban-board/models/comments.model.ts | 20 ++ .../detail/kanban-board/models/task.model.ts | 49 +++++ .../shared/task/kanban-task.component.html | 21 +- .../shared/task/kanban-task.component.scss | 5 +- .../shared/task/kanban-task.component.ts | 3 +- .../project-vacancy-card.component.ts | 24 ++- .../ui/components/badge/badge.component.html | 14 ++ .../ui/components/badge/badge.component.scss | 24 +++ .../ui/components/badge/badge.component.ts | 16 ++ .../components/button/button.component.scss | 6 +- .../app/ui/components/tag/tag.component.scss | 3 + .../src/assets/icons/svg/hastag.svg | 3 + .../assets/icons/symbol/svg/sprite.css.svg | 2 +- .../assets/images/projects/shared/divider.png | Bin 0 -> 401 bytes .../social_platform/src/styles/_colors.scss | 2 + 21 files changed, 549 insertions(+), 75 deletions(-) create mode 100644 projects/social_platform/src/app/office/models/tag.model.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/comments.model.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts create mode 100644 projects/social_platform/src/app/ui/components/badge/badge.component.html create mode 100644 projects/social_platform/src/app/ui/components/badge/badge.component.scss create mode 100644 projects/social_platform/src/app/ui/components/badge/badge.component.ts create mode 100644 projects/social_platform/src/assets/icons/svg/hastag.svg create mode 100644 projects/social_platform/src/assets/images/projects/shared/divider.png diff --git a/projects/social_platform/src/app/office/models/tag.model.ts b/projects/social_platform/src/app/office/models/tag.model.ts new file mode 100644 index 00000000..a5a5118a --- /dev/null +++ b/projects/social_platform/src/app/office/models/tag.model.ts @@ -0,0 +1,7 @@ +/** @format */ + +export interface Tag { + id: number; + name: string; + color: string; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html index 10b9069e..91471ba8 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html @@ -26,7 +26,7 @@
} @if (isTaskDetailOpen()) { -
+
прикрепить результат12.10.2025 21:00

+
+ divider image +
+
+ @if (taskDetailForm.get("responsible"); as responsible) {
@@ -59,11 +64,17 @@
ответственный
- -

Екатерина Ш

+ @if (responsible.value) { + +

{{ responsible.value.name }}

+ } @else { +
+ +
+ }
- + } @if (taskDetailForm.get("performers"); as performers) {
@@ -71,10 +82,20 @@
исполнители
- + @if (performers.value.length > 0) { +
+ @for (performer of performers.value; track $index) { + + } +
+ } @else { +
+ +
+ }
- + } @if (taskDetailForm.get("startDate"); as startDate) {
@@ -82,14 +103,12 @@
исполнители
-

20.10.25

+

{{ startDate.value || todayDate | date: "dd.MM.yy" }}

-
-

началась

-
+ закончена
- + } @if (taskDetailForm.get("deadline"); as deadline) {
@@ -97,55 +116,82 @@
исполнители
-

25.10.25

+

{{ deadline.value || tommorowDate | date: "dd.MM.yy" }}

-
-

10 дней

-
+ 10 дней
+ }
+ @if (taskDetailForm.get("tags"); as tags) {
- +

тег

- #аналитика + @if (tags.value.length > 0) { +
+ @for (tag of tags.value; track $index) { + {{ "#" + tag.name }} + } +
+ } @else { +
+ +
+ }
- + } @if (taskDetailForm.get("goal"); as goal) {

цель

- выход на рынок для... + @if (goal.value) { + {{ + goal.value.name.length > 20 ? goal.value.name.slice(0, 15) + "..." : goal.value.name + }} + } @else { +
+ +
+ }
- + } @if (taskDetailForm.get("skills"); as skills) {

навыки

- word + @if (skills.value.length > 0) { +
+ @for (skill of skills.value; track $index) { + {{ skill.name }} + } +
+ } @else { +
+ +
+ }
+ } +
+ +
+ divider image
+ @if (taskDetailForm.get("description"); as description) {
- -
-

+
+ @if (isChangeDescriptionText() && description.value) { +

@if (descriptionExpandable) {
исполнители > {{ readFullDescription ? "cкрыть" : "подробнее" }}
+ } } @else { + }
-
+ }
- + @if (taskDetailForm.get("files"); as files) { @if (files.value.length >= 0 && + files.value.length <= 3) { @for (file of files.value; track $index) { + + } @if (!(files.value.length === 3)) { +
+
+ +
+ +

файл

+
+ } } }
+
- - - - - - +
+ + +
+ + +
+ +
@for (f of filesList; track f.id) { исполнители [loading]="f.loading" [error]="f.error" > - } -
-
- +
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index c54a45d6..9ba7f826 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -1,3 +1,5 @@ +@use "styles/typography"; + .kanban { &__wrapper { position: relative; @@ -72,7 +74,7 @@ &-priority { width: 15px; height: 15px; - background-color: var(--green-dark); + background-color: var(--green); border-radius: var(--rounded-xxl); } @@ -117,6 +119,12 @@ color: var(--accent); } } + + &-list { + display: flex; + flex-direction: column; + gap: 4px; + } } &-info-wrapper { @@ -125,10 +133,82 @@ gap: 5px; } + &-add-responsible { + cursor: pointer; + padding: 8px; + border-radius: var(--rounded-xxl); + border: 0.5px dashed var(--accent); + } + + &-performers { + display: flex; + gap: 4px; + align-items: center; + margin-left: 12px; + + app-avatar { + margin-left: -12px; + } + } + + &-add-object { + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + align-self: center; + width: 100%; + padding: 2px 48px; + border: 0.5px solid var(--accent); + border-radius: var(--rounded-xl); + } + + &-description { + ::ng-deep { + app-textarea { + .field__input { + background-color: transparent; + border: none; + border-radius: 0; + margin-left: -10px; + min-height: 45px; + padding: 12px 12px 0px 12px; + + &:focus { + box-shadow: none; + border-color: none; + } + } + } + } + } + + &-files { + display: flex; + align-items: center; + gap: 10px; + margin-bottom: 40px; + } + + &-file { + width: 116px; + + &--empty { + display: flex; + align-items: center; + gap: 5px; + } + } + i { color: var(--accent); } } + + &__divider { + margin-top: 5px; + width: 100%; + } } .about { @@ -137,7 +217,7 @@ p { display: -webkit-box; overflow: hidden; - color: var(--black); + color: var(--grey-for-text); text-overflow: ellipsis; -webkit-box-orient: vertical; -webkit-line-clamp: 5; @@ -180,3 +260,83 @@ color: var(--accent-dark); } } + +.form { + padding: 10px 24px; + height: 28px; + width: 422px; + margin-bottom: -25px; + margin-left: -25px; + background-color: var(--light-white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + display: flex; + align-items: center; + justify-content: space-between; + + &__row { + display: flex; + align-items: center; + width: 100%; + + ::ng-deep { + app-input { + .field__input { + width: 100%; + background-color: transparent; + color: var(--grey-for-text) !important; + + @include typography.body-10; + } + } + } + } + + &__files { + display: flex; + flex-direction: column; + gap: 10px; + + &:not(:empty) { + margin-top: 20px; + } + } + + &__actions { + display: flex; + align-items: center; + gap: 5px; + + i { + color: var(--light-white); + } + + input { + display: none; + } + } + + &__attach { + i { + color: var(--dark-grey); + } + } + + &__send { + background-color: var(--accent); + width: 15px; + height: 15px; + border-radius: 3px; + padding: 4px; + color: var(--accent); + cursor: pointer; + } + + &__input { + flex-grow: 1; + resize: none; + background: transparent; + border: none; + outline: none; + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts index 67b86b27..f44e5783 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -1,7 +1,16 @@ /** @format */ -import { CommonModule } from "@angular/common"; -import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; +import { CommonModule, DatePipe } from "@angular/common"; +import { + ChangeDetectorRef, + Component, + ElementRef, + inject, + OnDestroy, + OnInit, + signal, + ViewChild, +} from "@angular/core"; import { Subscription } from "rxjs"; import { ProjectDataService } from "../services/project-data.service"; import { Project } from "@office/models/project.model"; @@ -16,6 +25,9 @@ import { expandElement } from "@utils/expand-element"; import { ParseBreaksPipe, ParseLinksPipe } from "@corelib"; import { FileItemComponent } from "@ui/components/file-item/file-item.component"; import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; +import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; +import { TextareaComponent } from "@ui/components/textarea/textarea.component"; +import { BadgeComponent } from "@ui/components/badge/badge.component"; @Component({ selector: "app-kanban-board", @@ -35,24 +47,52 @@ import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-up FileItemComponent, InputComponent, FileUploadItemComponent, + ReactiveFormsModule, + DatePipe, + TextareaComponent, + BadgeComponent, ], standalone: true, }) export class KanbanBoardComponent implements OnInit, OnDestroy { + @ViewChild("descEl") descEl?: ElementRef; + private readonly projectDataService = inject(ProjectDataService); private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); + private readonly cdRef = inject(ChangeDetectorRef); private subscriptions: Subscription[] = []; + constructor(private readonly fb: FormBuilder) { + this.taskDetailForm = this.fb.group({ + title: ["", Validators.required], + responsible: [null], + performers: this.fb.array([]), + startDate: [null], + deadline: [null], + tags: this.fb.array([]), + goal: [null], + skills: this.fb.array([]), + description: [null], + files: this.fb.array([]), + }); + } + projectBoardInfo = signal(null); boardColumns = signal([]); isTaskDetailOpen = signal(false); + isChangeDescriptionText = signal(false); descriptionExpandable!: boolean; // Флаг необходимости кнопки "Читать полностью" readFullDescription = false; // Флаг показа всех вакансий filesList: any[] = []; + todayDate = new Date(); + tommorowDate = new Date().setDate(this.todayDate.getDate() + 1); + + taskDetailForm: FormGroup; + ngOnInit(): void { const detailInfoUrl$ = this.route.queryParams.subscribe({ next: params => { @@ -113,6 +153,13 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.boardColumns.set(mockColumns); } + /** + * Проверка возможности расширения описания после инициализации представления + */ + ngAfterViewInit(): void { + this.checkDescriptionHeigth(); + } + ngOnDestroy(): void { this.subscriptions.forEach($ => $.unsubscribe()); } @@ -136,6 +183,13 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.isTaskDetailOpen.set(false); } + onChangeText(event: MouseEvent): void { + event.stopPropagation(); + this.isChangeDescriptionText.set(!this.isChangeDescriptionText()); + + setTimeout(() => this.checkDescriptionHeigth(), 0); + } + /** * Раскрытие/сворачивание описания профиля * @param elem - DOM элемент описания @@ -146,4 +200,11 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { expandElement(elem, expandedClass, isExpanded); this.readFullDescription = !isExpanded; } + + private checkDescriptionHeigth(): void { + const descElement = this.descEl?.nativeElement; + this.descriptionExpandable = descElement?.clientHeight < descElement?.scrollHeight; + + this.cdRef.detectChanges(); + } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts new file mode 100644 index 00000000..0de6d350 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts @@ -0,0 +1,6 @@ +/** @format */ + +export interface Board { + id: number; + name: string; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts new file mode 100644 index 00000000..a97ace85 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts @@ -0,0 +1,8 @@ +/** @format */ + +import { TaskPreview } from "./task.model"; + +export interface Column { + id: number; + tasks: TaskPreview[]; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/comments.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/comments.model.ts new file mode 100644 index 00000000..65421ae6 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/comments.model.ts @@ -0,0 +1,20 @@ +/** @format */ + +import { FileModel } from "@office/models/file.model"; +import { TaskDetail } from "./task.model"; +import { User } from "@auth/models/user.model"; + +export interface Comment { + id: number; + taskId: TaskDetail["id"]; + text: string; + file: FileModel; + user: { + id: User["id"]; + firstName: User["firstName"]; + lastName: User["lastName"]; + avatar: User["avatar"]; + role: User["speciality"]; + dateTimeCreated: string; + }; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts new file mode 100644 index 00000000..dccffc93 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts @@ -0,0 +1,49 @@ +/** @format */ + +import { User } from "@auth/models/user.model"; +import { FileModel } from "@office/models/file.model"; +import { Goal } from "@office/models/goals.model"; +import { Skill } from "@office/models/skill"; +import { Tag } from "@office/models/tag.model"; +import { Column } from "./column.model"; + +export interface TaskPreview { + id: number; + columnId: Column["id"]; + name: string; + priority: number; + description: string; + deadlineDate: string; + tag: Tag; + Goal: Goal; + type: string; + file: FileModel; + responsible: { + id: User["id"]; + avatar: User["avatar"]; + }; + performers: { + id: User["id"]; + avatar: User["avatar"]; + }[]; +} + +export interface TaskDetail extends TaskPreview { + score: number; + creator: { + id: User["id"]; + firstName: User["firstName"]; + lastName: User["lastName"]; + avatar: User["avatar"]; + }; + datetimeCreated: string; + dateTaskStart: string; + requiredSkills: Skill[]; + projectGoal: Goal["title"]; +} + +export interface TaskResult { + id: number; + description: string; + file: FileModel; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html index 2447d881..435af216 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html @@ -8,17 +8,18 @@ } @if (task?.responsible || task?.performers?.length || task?.files?.length || task.action) {
- @if (task?.responsible) { -
+ @if (task?.responsible; as responsible) { +
- +
- } @if (task?.performers?.length) { + } @if (task?.performers; as performers) { @if (performers.length > 0) { @for (performer of + performers; track $index) {
- +
- } + } } }
@if (task?.files?.length || task?.action) { @@ -35,10 +36,10 @@

04.04.2026

- } @if (task.tag) { - #аналитика - } @if (task.goal) { - выход на рынок для чего + } @if (task.tag; as tag) { + {{ "#" + tag.text }} + } @if (task.goal; as goal) { + {{ goal.text }} }
} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss index 097af114..a4d6accf 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss @@ -73,12 +73,15 @@ } &-responsible, - &-performers, &-deadline { display: flex; gap: 2px; align-items: center; + app-avatar { + margin-left: -2px; + } + i { min-width: 6px; } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts index 438a7448..e18cecef 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts @@ -7,12 +7,13 @@ import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { TagComponent } from "@ui/components/tag/tag.component"; import { hexToRgba } from "@utils/helpers/hexToRgba"; import { priorityInfoList } from "projects/core/src/consts/lists/priority-info-list.const"; +import { RouterLink } from "@angular/router"; @Component({ selector: "app-kanban-task", templateUrl: "./kanban-task.component.html", styleUrl: "./kanban-task.component.scss", - imports: [CommonModule, IconComponent, AvatarComponent, TagComponent], + imports: [CommonModule, IconComponent, AvatarComponent, TagComponent, RouterLink], standalone: true, }) export class KanbanTaskComponent { diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts b/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts index 8dd59e13..7ea01e81 100644 --- a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts @@ -1,6 +1,14 @@ /** @format */ import { CommonModule } from "@angular/common"; -import { Component, Input, OnInit } from "@angular/core"; +import { + ChangeDetectorRef, + Component, + ElementRef, + inject, + Input, + OnInit, + ViewChild, +} from "@angular/core"; import { RouterLink } from "@angular/router"; import { Vacancy } from "@office/models/vacancy.model"; import { IconComponent } from "@uilib"; @@ -49,6 +57,10 @@ export class ProjectVacancyCardComponent implements OnInit { @Input({ required: true }) vacancy!: Vacancy; // Данные вакансии (обязательное поле) @Input() type: "vacancies" | "project" = "project"; + @ViewChild("descEl") descEl?: ElementRef; + + private readonly cdRef = inject(ChangeDetectorRef); + ngOnInit(): void { if (this.type === "project") { this.endSliceOfSkills = 5; @@ -57,6 +69,16 @@ export class ProjectVacancyCardComponent implements OnInit { } } + /** + * Проверка возможности расширения описания после инициализации представления + */ + ngAfterViewInit(): void { + const descElement = this.descEl?.nativeElement; + this.descriptionExpandable = descElement?.clientHeight < descElement?.scrollHeight; + + this.cdRef.detectChanges(); + } + descriptionExpandable!: boolean; // Флаг необходимости кнопки "подробнее" readFullDescription = false; // Флаг показа всех вакансий endSliceOfSkills = 0; diff --git a/projects/social_platform/src/app/ui/components/badge/badge.component.html b/projects/social_platform/src/app/ui/components/badge/badge.component.html new file mode 100644 index 00000000..36473f90 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/badge/badge.component.html @@ -0,0 +1,14 @@ + + +
+ + + +
diff --git a/projects/social_platform/src/app/ui/components/badge/badge.component.scss b/projects/social_platform/src/app/ui/components/badge/badge.component.scss new file mode 100644 index 00000000..9bf82238 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/badge/badge.component.scss @@ -0,0 +1,24 @@ +.badge { + padding: 4px; + border-width: 0.5px; + border-style: solid; + border-radius: var(--rounded-xl); + + &--green { + color: var(--green); + border-color: var(--green); + background-color: var(--green-light); + } + + &--red { + color: var(--red); + background-color: var(--red-light); + border-color: var(--red); + } + + &--gold { + color: var(--gold); + background-color: var(--gold-light); + border-color: var(--gold); + } +} diff --git a/projects/social_platform/src/app/ui/components/badge/badge.component.ts b/projects/social_platform/src/app/ui/components/badge/badge.component.ts new file mode 100644 index 00000000..55c71a76 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/badge/badge.component.ts @@ -0,0 +1,16 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, Input } from "@angular/core"; + +@Component({ + selector: "app-badge", + templateUrl: "./badge.component.html", + styleUrl: "./badge.component.scss", + imports: [CommonModule], + standalone: true, +}) +export class BadgeComponent { + @Input() color: "green" | "red" | "gold" = "red"; + @Input() type: "deadline" | "start" = "deadline"; +} diff --git a/projects/social_platform/src/app/ui/components/button/button.component.scss b/projects/social_platform/src/app/ui/components/button/button.component.scss index 01f70b2c..222f881e 100644 --- a/projects/social_platform/src/app/ui/components/button/button.component.scss +++ b/projects/social_platform/src/app/ui/components/button/button.component.scss @@ -21,7 +21,7 @@ outline: none; &:hover { - background-color: var(--accent-light); + background-color: var(--accent-medium); box-shadow: -2px 3px 3px rgb(51 51 51 / 20%); } @@ -80,8 +80,8 @@ border: 0.5px solid var(--accent); &:hover { - color: var(--accent-light); - border-color: var(--accent-light); + color: var(--accent-medium); + border-color: var(--accent-medium); box-shadow: -2px 3px 3px rgb(51 51 51 / 20%); } diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.scss b/projects/social_platform/src/app/ui/components/tag/tag.component.scss index ab402eef..781ea3f3 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.scss +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.scss @@ -3,6 +3,9 @@ .tag { display: flex; align-items: center; + align-self: center; + justify-content: center; + text-align: center; max-width: 300px; padding: 2px 20px; overflow: hidden; diff --git a/projects/social_platform/src/assets/icons/svg/hastag.svg b/projects/social_platform/src/assets/icons/svg/hastag.svg new file mode 100644 index 00000000..75a1a822 --- /dev/null +++ b/projects/social_platform/src/assets/icons/svg/hastag.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg index fc716876..cffdd94d 100644 --- a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg +++ b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/projects/social_platform/src/assets/images/projects/shared/divider.png b/projects/social_platform/src/assets/images/projects/shared/divider.png new file mode 100644 index 0000000000000000000000000000000000000000..eaebf52a7b480203293c677b0942c2a099ab32a3 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0y~yU~B}kxjEQ?I!*5i zYVYZ*Y_aQU)>l}U$G6YvVED@$hRMhD7P?MvIehGV4+J#IYwS<+J3YHUfA{}R zi#>LEMvM$Dhp)fxe7*QxpEwgkN89@AbDb6bTIR4a2=KvN?Lx+UT|whX@{lh=1&%Iu7e$_5s;s;?85E@U#g+3leygrmW@yOx pQFZsP%a-G*EDR6+)a?Do%^G^`Uhui2%)k(2@O1TaS?83{1OPU&s5k%s literal 0 HcmV?d00001 diff --git a/projects/social_platform/src/styles/_colors.scss b/projects/social_platform/src/styles/_colors.scss index 55149b82..4c8b2b49 100644 --- a/projects/social_platform/src/styles/_colors.scss +++ b/projects/social_platform/src/styles/_colors.scss @@ -14,6 +14,7 @@ // GOLD --gold: #e5b25d; + --gold-light: #FDF8F0; --gold-dark: #c69849; // GRAY @@ -32,6 +33,7 @@ --green-light: #e3f0e8; --green-dark: #297373; --red: #d48a9e; + --red-light: #F4E2E7; --red-dark: #{color.adjust(#d48a9e, $blackness: 10%)}; --blue-dark: #2f36aa; --purple: #9a80e6; From d4e74c36f52e055cfe43f5e2013c7de265720244 Mon Sep 17 00:00:00 2001 From: Awakich Date: Thu, 13 Nov 2025 17:30:43 +0300 Subject: [PATCH 06/22] add colors for badge, styles for badge, task-detail type filled & empty --- .../kanban-board/kanban-board.component.scss | 50 +++++++++---------- .../ui/components/badge/badge.component.scss | 4 +- .../app/ui/components/tag/tag.component.scss | 2 +- .../social_platform/src/styles/_colors.scss | 4 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index 9ba7f826..abf715b7 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -134,10 +134,10 @@ } &-add-responsible { - cursor: pointer; padding: 8px; - border-radius: var(--rounded-xxl); + cursor: pointer; border: 0.5px dashed var(--accent); + border-radius: var(--rounded-xxl); } &-performers { @@ -152,13 +152,13 @@ } &-add-object { - cursor: pointer; display: flex; align-items: center; - justify-content: center; align-self: center; + justify-content: center; width: 100%; padding: 2px 48px; + cursor: pointer; border: 0.5px solid var(--accent); border-radius: var(--rounded-xl); } @@ -167,16 +167,16 @@ ::ng-deep { app-textarea { .field__input { + min-height: 45px; + padding: 12px 12px 0; + margin-left: -10px; background-color: transparent; border: none; border-radius: 0; - margin-left: -10px; - min-height: 45px; - padding: 12px 12px 0px 12px; &:focus { - box-shadow: none; border-color: none; + box-shadow: none; } } } @@ -185,8 +185,8 @@ &-files { display: flex; - align-items: center; gap: 10px; + align-items: center; margin-bottom: 40px; } @@ -195,8 +195,8 @@ &--empty { display: flex; - align-items: center; gap: 5px; + align-items: center; } } @@ -206,8 +206,8 @@ } &__divider { - margin-top: 5px; width: 100%; + margin-top: 5px; } } @@ -262,17 +262,17 @@ } .form { - padding: 10px 24px; - height: 28px; + display: flex; + align-items: center; + justify-content: space-between; width: 422px; + height: 28px; + padding: 10px 24px; margin-bottom: -25px; margin-left: -25px; background-color: var(--light-white); border: 0.5px solid var(--medium-grey-for-outline); border-radius: var(--rounded-lg); - display: flex; - align-items: center; - justify-content: space-between; &__row { display: flex; @@ -281,15 +281,15 @@ ::ng-deep { app-input { - .field__input { - width: 100%; - background-color: transparent; - color: var(--grey-for-text) !important; + .field__input { + width: 100%; + color: var(--grey-for-text) !important; + background-color: transparent; - @include typography.body-10; + @include typography.body-10; + } } } - } } &__files { @@ -304,8 +304,8 @@ &__actions { display: flex; - align-items: center; gap: 5px; + align-items: center; i { color: var(--light-white); @@ -323,13 +323,13 @@ } &__send { - background-color: var(--accent); width: 15px; height: 15px; - border-radius: 3px; padding: 4px; color: var(--accent); cursor: pointer; + background-color: var(--accent); + border-radius: 3px; } &__input { diff --git a/projects/social_platform/src/app/ui/components/badge/badge.component.scss b/projects/social_platform/src/app/ui/components/badge/badge.component.scss index 9bf82238..5b16d494 100644 --- a/projects/social_platform/src/app/ui/components/badge/badge.component.scss +++ b/projects/social_platform/src/app/ui/components/badge/badge.component.scss @@ -1,13 +1,13 @@ .badge { padding: 4px; - border-width: 0.5px; border-style: solid; + border-width: 0.5px; border-radius: var(--rounded-xl); &--green { color: var(--green); - border-color: var(--green); background-color: var(--green-light); + border-color: var(--green); } &--red { diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.scss b/projects/social_platform/src/app/ui/components/tag/tag.component.scss index 781ea3f3..261fbd97 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.scss +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.scss @@ -5,11 +5,11 @@ align-items: center; align-self: center; justify-content: center; - text-align: center; max-width: 300px; padding: 2px 20px; overflow: hidden; color: var(--accent); + text-align: center; text-overflow: ellipsis; white-space: nowrap; border-radius: var(--rounded-xxl); diff --git a/projects/social_platform/src/styles/_colors.scss b/projects/social_platform/src/styles/_colors.scss index 4c8b2b49..15918483 100644 --- a/projects/social_platform/src/styles/_colors.scss +++ b/projects/social_platform/src/styles/_colors.scss @@ -14,7 +14,7 @@ // GOLD --gold: #e5b25d; - --gold-light: #FDF8F0; + --gold-light: #fdf8f0; --gold-dark: #c69849; // GRAY @@ -33,7 +33,7 @@ --green-light: #e3f0e8; --green-dark: #297373; --red: #d48a9e; - --red-light: #F4E2E7; + --red-light: #f4e2e7; --red-dark: #{color.adjust(#d48a9e, $blackness: 10%)}; --blue-dark: #2f36aa; --purple: #9a80e6; From d033e35e436303c55e743e3e796a3e3b0595d984 Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 18 Nov 2025 18:50:10 +0300 Subject: [PATCH 07/22] add form & initialization for task-detail, add dropdown, create-tag component, fix websockets to subprotocol --- .../consts/lists/actiion-type-list.const.ts | 22 + .../consts/lists/priority-info-list.const.ts | 12 +- .../src/consts/lists/tag-colots.list.const.ts | 36 ++ .../core/src/lib/services/token.service.ts | 6 +- .../app/core/services/websocket.service.ts | 11 +- .../context-menu/context-menu.component.html | 24 + .../context-menu/context-menu.component.scss | 61 +++ .../context-menu/context-menu.component.ts | 195 ++++++++ .../message-input.component.scss | 2 +- .../news-card/news-card.component.scss | 6 +- .../stage-zero/stage-zero.component.ts | 4 +- .../profile/detail/main/main.component.scss | 1 + .../app/office/profile/edit/edit.component.ts | 6 +- .../program/detail/main/main.component.html | 7 +- .../program/detail/main/main.component.ts | 4 +- .../detail/register/register.component.scss | 2 +- .../shared/news-card/news-card.component.html | 113 ----- .../shared/news-card/news-card.component.scss | 239 ---------- .../news-card/news-card.component.spec.ts | 50 -- .../shared/news-card/news-card.component.ts | 363 -------------- .../kanban-board/kanban-board.component.html | 283 ++--------- .../kanban-board/kanban-board.component.scss | 319 +------------ .../kanban-board/kanban-board.component.ts | 99 +--- .../kanban-board/kanban-board.service.ts | 6 +- .../detail/kanban-board/models/task.model.ts | 13 +- .../create-tag-form.component.html | 31 ++ .../create-tag-form.component.scss | 71 +++ .../create-tag-form.component.ts | 61 +++ .../kanban-board-sidebar.component.html | 18 +- .../kanban-board-sidebar.component.scss | 1 + .../sidebar/kanban-board-sidebar.component.ts | 47 +- .../task/detail/task-detail.component.html | 448 ++++++++++++++++++ .../task/detail/task-detail.component.scss | 395 +++++++++++++++ .../task/detail/task-detail.component.ts | 432 +++++++++++++++++ .../shared/task/kanban-task.component.ts | 26 +- .../edit/services/project-form.service.ts | 2 +- .../services/project-resources.service.ts | 1 - .../edit/services/project-vacancy.service.ts | 2 +- .../office/projects/list/list.component.ts | 2 +- .../app/office/projects/projects.component.ts | 2 +- .../src/app/office/services/chat.service.ts | 2 +- .../dropdown/dropdown.component.html | 61 +++ .../dropdown/dropdown.component.scss | 74 +++ .../components/dropdown/dropdown.component.ts | 108 +++++ .../ui/components/input/input.component.html | 20 + .../ui/components/input/input.component.scss | 2 +- .../ui/components/input/input.component.ts | 124 ++--- .../ui/components/modal/modal.component.html | 2 +- .../components/select/select.component.html | 23 +- .../components/select/select.component.scss | 38 -- .../ui/components/select/select.component.ts | 12 +- .../app/ui/components/tag/tag.component.html | 12 +- .../app/ui/components/tag/tag.component.scss | 26 +- .../app/ui/components/tag/tag.component.ts | 30 +- .../src/app/utils/days-untit.ts | 13 + .../src/app/utils/helpers/getPriorityType.ts | 22 + .../{ => helpers}/inviteToProjectMapper.ts | 0 .../src/app/utils/{ => helpers}/stripNull.ts | 0 .../app/utils/{ => helpers}/transformYear.ts | 0 .../{ => helpers}/yearRangeValidators.ts | 0 60 files changed, 2372 insertions(+), 1620 deletions(-) create mode 100644 projects/core/src/consts/lists/actiion-type-list.const.ts create mode 100644 projects/core/src/consts/lists/tag-colots.list.const.ts create mode 100644 projects/social_platform/src/app/office/features/context-menu/context-menu.component.html create mode 100644 projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss create mode 100644 projects/social_platform/src/app/office/features/context-menu/context-menu.component.ts delete mode 100644 projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.html delete mode 100644 projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.scss delete mode 100644 projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.spec.ts delete mode 100644 projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts create mode 100644 projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html create mode 100644 projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss create mode 100644 projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts create mode 100644 projects/social_platform/src/app/utils/days-untit.ts create mode 100644 projects/social_platform/src/app/utils/helpers/getPriorityType.ts rename projects/social_platform/src/app/utils/{ => helpers}/inviteToProjectMapper.ts (100%) rename projects/social_platform/src/app/utils/{ => helpers}/stripNull.ts (100%) rename projects/social_platform/src/app/utils/{ => helpers}/transformYear.ts (100%) rename projects/social_platform/src/app/utils/{ => helpers}/yearRangeValidators.ts (100%) diff --git a/projects/core/src/consts/lists/actiion-type-list.const.ts b/projects/core/src/consts/lists/actiion-type-list.const.ts new file mode 100644 index 00000000..399e0d35 --- /dev/null +++ b/projects/core/src/consts/lists/actiion-type-list.const.ts @@ -0,0 +1,22 @@ +/** @format */ + +export const actionTypeList = [ + { + id: 1, + value: "action", + label: "действие", + additionalInfo: "task", + }, + { + id: 2, + value: "call", + label: "звонок", + additionalInfo: "phone", + }, + { + id: 3, + value: "meet", + label: "встреча", + additionalInfo: "people-bold", + }, +]; diff --git a/projects/core/src/consts/lists/priority-info-list.const.ts b/projects/core/src/consts/lists/priority-info-list.const.ts index c9ddcc8d..688e69a0 100644 --- a/projects/core/src/consts/lists/priority-info-list.const.ts +++ b/projects/core/src/consts/lists/priority-info-list.const.ts @@ -10,37 +10,37 @@ export const priorityInfoList = [ { id: 0, - name: "бэклог", + label: "бэклог", color: "#322299", priorityType: 0, }, { id: 1, - name: "в ближайшие часы", + label: "в ближайшие часы", color: "#A63838", priorityType: 1, }, { id: 2, - name: "высокий", + label: "высокий", color: "#D48A9E", priorityType: 2, }, { id: 3, - name: "средний", + label: "средний", color: "#E5B25D", priorityType: 3, }, { id: 4, - name: "низкий", + label: "низкий", color: "#297373", priorityType: 4, }, { id: 5, - name: "улучшение", + label: "улучшение", color: "#88C9A1", priorityType: 5, }, diff --git a/projects/core/src/consts/lists/tag-colots.list.const.ts b/projects/core/src/consts/lists/tag-colots.list.const.ts new file mode 100644 index 00000000..4a8d1e21 --- /dev/null +++ b/projects/core/src/consts/lists/tag-colots.list.const.ts @@ -0,0 +1,36 @@ +/** @format */ + +export const tagColorsList = [ + { + id: 1, + color: "#8A63E6", + }, + { + id: 2, + color: "#9764BA", + }, + { + id: 3, + color: "#2F36AA", + }, + { + id: 4, + color: "#4CD9F1", + }, + { + id: 5, + color: "#88C9A1", + }, + { + id: 6, + color: "#D48A9E", + }, + { + id: 7, + color: "#E5B25D", + }, + { + id: 8, + color: "#297373", + }, +]; diff --git a/projects/core/src/lib/services/token.service.ts b/projects/core/src/lib/services/token.service.ts index 0fe3ba9e..06f74b0e 100644 --- a/projects/core/src/lib/services/token.service.ts +++ b/projects/core/src/lib/services/token.service.ts @@ -5,7 +5,7 @@ import { map, Observable } from "rxjs"; import { RefreshResponse } from "@auth/models/http.model"; import { plainToInstance } from "class-transformer"; import { Tokens } from "@auth/models/tokens.model"; -import Cookies from "js-cookie"; +import Cookies, { CookieAttributes } from "js-cookie"; import { ApiService, PRODUCTION } from "@corelib"; /** @@ -66,11 +66,13 @@ export class TokenService { * - Используются дефолтные настройки браузера * - Cookies привязаны к текущему домену */ - getCookieOptions() { + getCookieOptions(): CookieAttributes { if (this.production) { return { domain: ".procollab.ru", // Домен для production окружения expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30), // 30 дней + secure: true, + sameSite: "None", }; } diff --git a/projects/social_platform/src/app/core/services/websocket.service.ts b/projects/social_platform/src/app/core/services/websocket.service.ts index 224f55e3..a99043f9 100644 --- a/projects/social_platform/src/app/core/services/websocket.service.ts +++ b/projects/social_platform/src/app/core/services/websocket.service.ts @@ -1,9 +1,10 @@ /** @format */ -import { Injectable } from "@angular/core"; +import { inject, Injectable } from "@angular/core"; import { filter, map, Observable, Observer, retry, Subject } from "rxjs"; import { environment } from "@environment"; import * as snakecaseKeys from "snakecase-keys"; import camelcaseKeys from "camelcase-keys"; +import { TokenService } from "@corelib"; /** * Сервис для работы с WebSocket соединениями @@ -20,6 +21,8 @@ export class WebsocketService { /** Subject для обработки входящих сообщений */ private messages$ = new Subject(); + private readonly tokenService = inject(TokenService); + /** Флаг состояния соединения */ public isConnected = false; @@ -36,7 +39,11 @@ export class WebsocketService { */ public connect(path: string): Observable { return new Observable((observer: Observer) => { - this.socket = new WebSocket(environment.websocketUrl + path); + const tokens = this.tokenService.getTokens(); + + const tokenAccess = tokens?.access ? tokens.access : ""; + + this.socket = new WebSocket(environment.websocketUrl + path, ["Bearer", tokenAccess]); this.socket.onopen = () => { this.isConnected = true; diff --git a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.html b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.html new file mode 100644 index 00000000..51877321 --- /dev/null +++ b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.html @@ -0,0 +1,24 @@ + + +
    + @for (item of visibleItems; track item.id) { +
  • + {{ item.label }} +
    • + @if (item.divider && !$last) { +
  • + } } +
diff --git a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss new file mode 100644 index 00000000..b9c0093d --- /dev/null +++ b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss @@ -0,0 +1,61 @@ +/** @format */ + +.context-menu { + position: fixed; + z-index: 9999; + + background-color: white; + border-radius: 8px; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12); + + padding: 8px 0; + margin: 0; + list-style: none; + + transition: opacity 0.15s ease; + outline: none; + + &__item { + padding: 10px 16px; + cursor: pointer; + white-space: nowrap; + user-select: none; + transition: background-color 0.15s ease; + + &:hover { + background-color: rgba(0, 0, 0, 0.04); + } + + &:active { + background-color: rgba(0, 0, 0, 0.08); + } + + &--red { + color: #f44336; + + &:hover { + background-color: rgba(244, 67, 54, 0.08); + } + + &:active { + background-color: rgba(244, 67, 54, 0.16); + } + } + + &--primary { + color: #2196f3; + } + + &--disabled { + opacity: 0.5; + cursor: not-allowed; + pointer-events: none; + } + } + + &__divider { + height: 1px; + margin: 8px 0; + background-color: rgba(0, 0, 0, 0.08); + } +} diff --git a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.ts b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.ts new file mode 100644 index 00000000..79a7d3ca --- /dev/null +++ b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.ts @@ -0,0 +1,195 @@ +/** @format */ + +import { + AfterViewInit, + Component, + ElementRef, + EventEmitter, + Input, + OnDestroy, + Output, + ViewChild, +} from "@angular/core"; +import { DomPortal } from "@angular/cdk/portal"; +import { Overlay, OverlayRef } from "@angular/cdk/overlay"; +import { ClickOutsideModule } from "ng-click-outside"; +import { CommonModule } from "@angular/common"; + +/** + * Универсальный компонент контекстного меню + * + * Особенности: + * - Автоматическое позиционирование с учетом границ экрана + * - Гибкая конфигурация пунктов меню + * - Поддержка условного отображения пунктов + * - Автоматическое закрытие при клике вне меню + * + * @example + * ```html + * + * ``` + */ +@Component({ + selector: "app-context-menu", + templateUrl: "./context-menu.component.html", + styleUrl: "./context-menu.component.scss", + standalone: true, + imports: [CommonModule, ClickOutsideModule], +}) +export class ContextMenuComponent implements AfterViewInit, OnDestroy { + constructor(private readonly overlay: Overlay) {} + + /** Список пунктов меню */ + @Input({ required: true }) items: any[] = []; + + /** Дополнительный CSS класс для меню */ + @Input() customClass?: string; + + /** Минимальная ширина меню */ + @Input() minWidth?: number; + + /** Событие клика по пункту меню */ + @Output() itemClick = new EventEmitter(); + + /** Событие открытия меню */ + @Output() menuOpen = new EventEmitter(); + + /** Событие закрытия меню */ + @Output() menuClose = new EventEmitter(); + + /** Ссылка на элемент контекстного меню */ + @ViewChild("contextMenu", { static: false }) contextMenu!: ElementRef; + + /** Ссылка на overlay */ + private overlayRef?: OverlayRef; + + /** Portal для контекстного меню */ + private portal?: DomPortal; + + /** Состояние открытия контекстного меню */ + isOpen = false; + + /** Инициализация overlay для контекстного меню */ + ngAfterViewInit(): void { + this.overlayRef = this.overlay.create({ + hasBackdrop: false, + scrollStrategy: this.overlay.scrollStrategies.close(), + }); + this.portal = new DomPortal(this.contextMenu); + } + + /** Очистка ресурсов overlay */ + ngOnDestroy(): void { + this.overlayRef?.dispose(); + } + + /** + * Открытие контекстного меню в заданной позиции + * @param event - событие мыши (для автоматического позиционирования) + * @param position - пользовательская позиция меню + */ + open(event?: MouseEvent, position?: { x: number; y: number }): void { + if (this.isOpen) return; + + this.isOpen = true; + this.menuOpen.emit(); + + // Ждем рендеринга меню для получения его размеров + setTimeout(() => { + const menuHeight = this.contextMenu.nativeElement.offsetHeight; + const menuWidth = this.contextMenu.nativeElement.offsetWidth; + + let positionX: number; + let positionY: number; + + if (event) { + // Автоматическое позиционирование относительно курсора + positionX = event.clientX; + positionY = event.clientY; + + // Проверка выхода за правую границу экрана + if (positionX + menuWidth > window.innerWidth) { + positionX = window.innerWidth - menuWidth - 10; + } + + // Проверка выхода за нижнюю границу экрана + if (positionY + menuHeight > window.innerHeight) { + positionY = event.clientY - menuHeight; + } + } else if (position) { + // Использование пользовательской позиции + positionX = position.x; + positionY = position.y; + } else { + // Позиция по умолчанию + positionX = 0; + positionY = 0; + } + + const positionStrategy = this.overlay + .position() + .global() + .left(positionX + "px") + .top(positionY + "px"); + + this.overlayRef?.updatePositionStrategy(positionStrategy); + + if (!this.overlayRef?.hasAttached()) { + this.overlayRef?.attach(this.portal); + } + + this.contextMenu.nativeElement.focus(); + }, 0); + } + + /** + * Закрытие контекстного меню + */ + close(): void { + if (!this.isOpen) return; + + this.isOpen = false; + this.menuClose.emit(); + this.overlayRef?.detach(); + } + + /** + * Переключение состояния меню + * @param event - событие мыши + */ + toggle(event?: MouseEvent): void { + if (this.isOpen) { + this.close(); + } else { + this.open(event); + } + } + + /** + * Обработчик клика по пункту меню + * @param event - событие клика + * @param itemId - идентификатор пункта меню + */ + onItemClick(event: MouseEvent, itemId: string): void { + event.stopPropagation(); + this.itemClick.emit(itemId); + this.close(); + } + + /** + * Обработчик клика вне меню + */ + onClickOutside(): void { + this.close(); + } + + /** + * Фильтр видимых пунктов меню + */ + get visibleItems(): any[] { + return this.items.filter(item => item.visible !== false); + } +} diff --git a/projects/social_platform/src/app/office/features/message-input/message-input.component.scss b/projects/social_platform/src/app/office/features/message-input/message-input.component.scss index f9f689b1..ad62c820 100644 --- a/projects/social_platform/src/app/office/features/message-input/message-input.component.scss +++ b/projects/social_platform/src/app/office/features/message-input/message-input.component.scss @@ -216,7 +216,7 @@ $button-size: 40px; padding: 36px; background-color: var(--white); border: 2px dashed var(--accent); - border-radius: 5px; + border-radius: var(--rounded-md); transform: translate(-50%, -50%); } diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss index d449adec..f49fdc35 100644 --- a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss +++ b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss @@ -30,6 +30,8 @@ &__options { position: absolute; + top: 0%; + right: 0%; z-index: 2; padding: 20px 0; background-color: var(--white); @@ -40,10 +42,12 @@ &__option { padding: 5px 20px; cursor: pointer; + width: 120px; transition: background-color 0.2s; + color: var(--grey-for-text); &:hover { - background-color: var(--light-gray); + color: var(--accent); } } diff --git a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts b/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts index c640864b..8c8dc8ed 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts +++ b/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts @@ -21,8 +21,8 @@ import { languageNamesList, } from "projects/core/src/consts/lists/language-info-list.const"; import { IconComponent } from "@uilib"; -import { transformYearStringToNumber } from "@utils/transformYear"; -import { yearRangeValidators } from "@utils/yearRangeValidators"; +import { transformYearStringToNumber } from "@utils/helpers/transformYear"; +import { yearRangeValidators } from "@utils/helpers/yearRangeValidators"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { TooltipComponent } from "@ui/components/tooltip/tooltip.component"; import { generateOptionsList } from "@utils/generate-options-list"; diff --git a/projects/social_platform/src/app/office/profile/detail/main/main.component.scss b/projects/social_platform/src/app/office/profile/detail/main/main.component.scss index 6f5c6b43..89b19e5e 100644 --- a/projects/social_platform/src/app/office/profile/detail/main/main.component.scss +++ b/projects/social_platform/src/app/office/profile/detail/main/main.component.scss @@ -364,6 +364,7 @@ display: flex; gap: 6px; align-items: center; + color: var(--grey-for-text); &--status { padding: 8px; diff --git a/projects/social_platform/src/app/office/profile/edit/edit.component.ts b/projects/social_platform/src/app/office/profile/edit/edit.component.ts index e597b74e..2546a80a 100644 --- a/projects/social_platform/src/app/office/profile/edit/edit.component.ts +++ b/projects/social_platform/src/app/office/profile/edit/edit.component.ts @@ -46,8 +46,8 @@ import { languageLevelsList, languageNamesList, } from "projects/core/src/consts/lists/language-info-list.const"; -import { transformYearStringToNumber } from "@utils/transformYear"; -import { yearRangeValidators } from "@utils/yearRangeValidators"; +import { transformYearStringToNumber } from "@utils/helpers/transformYear"; +import { yearRangeValidators } from "@utils/helpers/yearRangeValidators"; import { Achievement, User } from "@auth/models/user.model"; import { generateOptionsList } from "@utils/generate-options-list"; import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; @@ -164,7 +164,7 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit { // skills speciality: ["", [Validators.required]], skills: [[]], - avatar: [""], + avatar: ["", Validators.required], aboutMe: [""], typeSpecific: this.fb.group({}), }); diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.html b/projects/social_platform/src/app/office/program/detail/main/main.component.html index b4c9e367..b83598b6 100644 --- a/projects/social_platform/src/app/office/program/detail/main/main.component.html +++ b/projects/social_platform/src/app/office/program/detail/main/main.component.html @@ -45,14 +45,15 @@

о программе

@if (program.isUserManager) { } @for (n of news(); track n.id) { - + > }
diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.ts b/projects/social_platform/src/app/office/program/detail/main/main.component.ts index 6c0583b1..176476ca 100644 --- a/projects/social_platform/src/app/office/program/detail/main/main.component.ts +++ b/projects/social_platform/src/app/office/program/detail/main/main.component.ts @@ -27,7 +27,6 @@ import { FeedNews } from "@office/projects/models/project-news.model"; import { expandElement } from "@utils/expand-element"; import { ParseBreaksPipe, ParseLinksPipe } from "projects/core"; import { UserLinksPipe } from "@core/pipes/user-links.pipe"; -import { ProgramNewsCardComponent } from "../shared/news-card/news-card.component"; import { ButtonComponent, IconComponent } from "@ui/components"; import { ApiPagination } from "@models/api-pagination.model"; import { TagComponent } from "@ui/components/tag/tag.component"; @@ -40,6 +39,7 @@ import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component" import { NewsFormComponent } from "@office/features/news-form/news-form.component"; import { AsyncPipe } from "@angular/common"; import { AvatarComponent } from "@uilib"; +import { NewsCardComponent } from "@office/features/news-card/news-card.component"; @Component({ selector: "app-main", @@ -49,7 +49,6 @@ import { AvatarComponent } from "@uilib"; imports: [ IconComponent, ButtonComponent, - ProgramNewsCardComponent, UserLinksPipe, AsyncPipe, ParseBreaksPipe, @@ -63,6 +62,7 @@ import { AvatarComponent } from "@uilib"; AvatarComponent, TagComponent, RouterModule, + NewsCardComponent, ], }) export class ProgramDetailMainComponent implements OnInit, OnDestroy { diff --git a/projects/social_platform/src/app/office/program/detail/register/register.component.scss b/projects/social_platform/src/app/office/program/detail/register/register.component.scss index e8f280db..089025b0 100644 --- a/projects/social_platform/src/app/office/program/detail/register/register.component.scss +++ b/projects/social_platform/src/app/office/program/detail/register/register.component.scss @@ -7,7 +7,7 @@ .form { padding: 24px; background-color: var(--white); - border-radius: 5px; + border-radius: var(--rounded-md); &__fieldset { &:not(:last-child) { diff --git a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.html b/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.html deleted file mode 100644 index 58febdee..00000000 --- a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.html +++ /dev/null @@ -1,113 +0,0 @@ - -
-
-
- -
-
-
{{ newsItem.name }}
- @if (newsItem.pin) { - - } -
-
-
- @if(isOwner) { -
-
- -
- @if (menuOpen) { -
    -
  • Удалить
    • -
- } -
- } -
- @if (newsItem.text) { -
-

-
- } @if (editMode) { -
    - @for (f of imagesEditList; track f.id) { - - } -
-
    - @for (f of filesEditList; track f.id) { - - } -
- } @if (newsTextExpandable && !editMode) { -
- {{ readMore ? "скрыть" : "читать полностью" }} -
- } @if (!editMode) { -
- @for (f of imagesViewList; let index = $index; track index) { -
- -
- -
-
- } -
- } @if (!editMode && filesViewList.length) { -
- @for (f of filesViewList; track $index) { - - } -
- } @if (!editMode) { -
-
- - - - - -
-
-
- {{ newsItem.datetimeCreated | dayjs: "format":"DD.MM.YY" }} -
-
-
- } -
diff --git a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.scss b/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.scss deleted file mode 100644 index 3c819c82..00000000 --- a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.scss +++ /dev/null @@ -1,239 +0,0 @@ -@use "styles/responsive"; -@use "styles/typography"; - -.card { - padding: 24px 12px; - background-color: var(--light-white); - border: 0.5px solid var(--medium-grey-for-outline); - border-radius: var(--rounded-lg); - - &__head { - display: flex; - align-items: center; - justify-content: space-between; - margin-bottom: 10px; - } - - &__menu { - position: relative; - } - - &__dots { - display: flex; - align-items: center; - justify-content: center; - width: 16px; - height: 16px; - color: var(--black); - cursor: pointer; - } - - &__options { - position: absolute; - z-index: 2; - padding: 20px 0; - background-color: var(--white); - border: 1px solid var(--medium-grey-for-outline); - border-radius: var(--rounded-xl); - } - - &__option { - padding: 5px 20px; - cursor: pointer; - transition: background-color 0.2s; - - &:hover { - background-color: var(--light-gray); - } - } - - &__avatar { - width: 40px; - height: 40px; - margin-right: 10px; - border-radius: 50%; - } - - &__title { - display: flex; - align-items: center; - } - - &__top { - display: flex; - gap: 10px; - align-items: center; - } - - &__name { - color: var(--black); - } - - &__date { - color: var(--dark-grey); - } - - /* stylelint-disable value-no-vendor-prefix */ - &__text { - white-space: break-spaces; - - @include typography.body-10; - - p { - display: -webkit-box; - overflow: hidden; - color: var(--black); - text-overflow: ellipsis; - -webkit-box-orient: vertical; - -webkit-line-clamp: 4; - transition: all 0.7s ease-in-out; - - &.expanded { - -webkit-line-clamp: unset; - } - } - } - - /* stylelint-enable value-no-vendor-prefix */ - - &__edit-files { - display: flex; - flex-direction: column; - gap: 10px; - - &:not(:empty) { - margin-top: 30px; - } - } - - &__gallery { - display: flex; - flex-direction: column; - gap: 10px; - margin-top: 10px; - margin-bottom: 10px; - } - - &__files { - display: flex; - flex-direction: column; - gap: 10px; - margin-bottom: 20px; - } - - &__img { - position: relative; - - img { - width: 100%; - object-fit: cover; - } - } - - &__img-like { - position: absolute; - top: 50%; - left: 50%; - display: flex; - align-items: center; - justify-content: center; - width: 75px; - height: 75px; - color: var(--accent); - background-color: var(--white); - border-radius: var(--rounded-xl); - transition: transform 0.1s ease-in-out; - transform: translate(-50%, -50%) scale(0); - - &--show { - transform: translate(-50%, -50%) scale(1); - } - } - - &__footer { - margin-top: 10px; - } - - &__read-more { - margin-bottom: 10px; - } -} - -.footer { - display: flex; - align-items: center; - justify-content: space-between; - - &__left { - display: flex; - gap: 5px; - align-items: center; - } - - &__item { - display: flex; - align-items: center; - color: var(--dark-grey); - - &:not(:last-child) { - margin-right: 5px; - } - - i { - margin-right: 3px; - } - } - - &__like { - cursor: pointer; - - &--active { - color: var(--accent); - } - } -} - -.share { - color: var(--dark-grey); - - &__icon { - cursor: pointer; - } -} - -.read-more { - margin-top: 12px; - color: var(--accent); - cursor: pointer; - transition: color 0.2s; - - &:hover { - color: var(--accent-dark); - } -} - -.editor-footer { - display: flex; - justify-content: space-between; - padding-top: 10px; - margin-top: 20px; - border-top: 1px solid var(--medium-grey-for-outline); - - &__actions { - display: flex; - - app-button { - display: block; - margin-right: 10px; - } - } - - &__attach { - color: var(--dark-grey); - cursor: pointer; - - input { - display: none; - } - } -} diff --git a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.spec.ts b/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.spec.ts deleted file mode 100644 index 9dbf5bff..00000000 --- a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.spec.ts +++ /dev/null @@ -1,50 +0,0 @@ -/** @format */ - -import { ComponentFixture, TestBed } from "@angular/core/testing"; - -import { ProgramNewsCardComponent } from "./news-card.component"; -import { RouterTestingModule } from "@angular/router/testing"; -import { ReactiveFormsModule } from "@angular/forms"; -import { of } from "rxjs"; -import { ProjectNewsService } from "@office/projects/detail/services/project-news.service"; -import { AuthService } from "@auth/services"; -import { HttpClientTestingModule } from "@angular/common/http/testing"; -import { DayjsPipe } from "projects/core"; -import { FeedNews } from "@office/projects/models/project-news.model"; - -describe("NewsCardComponent", () => { - let component: ProgramNewsCardComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - const projectNewsServiceSpy = jasmine.createSpyObj(["addNews"]); - const authSpy = { - profile: of({}), - }; - - await TestBed.configureTestingModule({ - imports: [ - RouterTestingModule, - ReactiveFormsModule, - HttpClientTestingModule, - ProgramNewsCardComponent, - DayjsPipe, - ], - providers: [ - { provide: ProjectNewsService, useValue: projectNewsServiceSpy }, - { provide: AuthService, useValue: authSpy }, - ], - }).compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ProgramNewsCardComponent); - component = fixture.componentInstance; - component.newsItem = FeedNews.default(); - fixture.detectChanges(); - }); - - it("should create", () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.ts b/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.ts deleted file mode 100644 index 2c632969..00000000 --- a/projects/social_platform/src/app/office/program/detail/shared/news-card/news-card.component.ts +++ /dev/null @@ -1,363 +0,0 @@ -/** @format */ - -import { - AfterViewInit, - ChangeDetectorRef, - Component, - ElementRef, - EventEmitter, - Input, - OnInit, - Output, - ViewChild, -} from "@angular/core"; -import { SnackbarService } from "@ui/services/snackbar.service"; -import { ActivatedRoute } from "@angular/router"; -import { expandElement } from "@utils/expand-element"; -import { FileModel } from "@office/models/file.model"; -import { nanoid } from "nanoid"; -import { FileService } from "@core/services/file.service"; -import { forkJoin, noop, Observable, tap } from "rxjs"; -import { DayjsPipe, ParseLinksPipe } from "projects/core"; -import { FileItemComponent } from "@ui/components/file-item/file-item.component"; -import { IconComponent } from "@ui/components"; -import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; -import { ImgCardComponent } from "@office/shared/img-card/img-card.component"; -import { FeedNews } from "@office/projects/models/project-news.model"; - -/** - * Компонент карточки новости программы - * - * Отображает отдельную новость в ленте программы с полным функционалом: - * - Просмотр текста новости с возможностью развернуть/свернуть - * - Отображение прикрепленных файлов (изображения и документы) - * - Режим редактирования новости (для владельца) - * - Взаимодействие с новостью (лайки, копирование ссылки) - * - Загрузка и удаление файлов в режиме редактирования - * - * Принимает: - * @Input newsItem: FeedNews - Объект новости для отображения - * @Input isOwner: boolean - Является ли пользователь владельцем новости - * - * Генерирует события: - * @Output delete: EventEmitter - Удаление новости - * @Output like: EventEmitter - Лайк/дизлайк новости - * @Output edited: EventEmitter - Редактирование новости - * - * Зависимости: - * @param {SnackbarService} snackbarService - Для уведомлений - * @param {FileService} fileService - Для работы с файлами - * @param {ActivatedRoute} route - Для получения ID программы - * @param {ChangeDetectorRef} cdRef - Для обновления представления - * - * Состояние: - * @property {boolean} newsTextExpandable - Можно ли развернуть текст - * @property {boolean} readMore - Развернут ли текст новости - * @property {boolean} editMode - Активен ли режим редактирования - * @property {boolean[]} showLikes - Массив состояний показа лайков для изображений - * - * Файлы: - * @property {FileModel[]} imagesViewList - Изображения для просмотра - * @property {FileModel[]} filesViewList - Файлы для просмотра - * @property {Array} imagesEditList - Изображения в режиме редактирования - * @property {Array} filesEditList - Файлы в режиме редактирования - * - * Методы: - * @method onCopyLink() - Копирует ссылку на новость в буфер обмена - * @method onUploadFile(event) - Загружает новые файлы - * @method onDeletePhoto(fId) - Удаляет изображение - * @method onDeleteFile(fId) - Удаляет файл - * @method onRetryUpload(id) - Повторяет загрузку файла при ошибке - * @method onTouchImg(event, imgIdx) - Обработчик двойного тапа для лайка - * @method onExpandNewsText() - Разворачивает/сворачивает текст новости - * - * Особенности: - * - Разделение файлов на изображения и документы - * - Поддержка drag&drop для загрузки файлов - * - Обработка ошибок загрузки с возможностью повтора - * - Двойной тап на изображениях для лайка (мобильные устройства) - * - Автоматическое определение высоты текста для кнопки "Читать далее" - * - * Возвращает: - * HTML шаблон карточки новости со всем функционалом - */ -@Component({ - selector: "app-program-news-card", - templateUrl: "./news-card.component.html", - styleUrl: "./news-card.component.scss", - standalone: true, - imports: [ - ImgCardComponent, - FileUploadItemComponent, - IconComponent, - FileItemComponent, - DayjsPipe, - ParseLinksPipe, - ], -}) -export class ProgramNewsCardComponent implements OnInit, AfterViewInit { - constructor( - private readonly snackbarService: SnackbarService, - private readonly fileService: FileService, - private readonly route: ActivatedRoute, - private readonly cdRef: ChangeDetectorRef - ) {} - - @Input({ required: true }) newsItem!: FeedNews; - @Input() isOwner!: boolean; - @Output() delete = new EventEmitter(); - @Output() like = new EventEmitter(); - @Output() edited = new EventEmitter(); - - newsTextExpandable!: boolean; - readMore = false; - editMode = false; - - /** Состояние меню действий */ - menuOpen = false; - - /** - * Закрытие меню действий - */ - onCloseMenu() { - this.menuOpen = false; - } - - ngOnInit(): void { - this.showLikes = this.newsItem.files.map(() => false); - - this.imagesViewList = this.newsItem.files.filter( - f => f.mimeType.split("/")[0] === "image" || f.mimeType.split("/")[1] === "x-empty" - ); - this.filesViewList = this.newsItem.files.filter( - f => f.mimeType.split("/")[0] !== "image" && f.mimeType.split("/")[1] !== "x-empty" - ); - - this.imagesEditList = this.imagesViewList.map(file => ({ - src: file.link, - id: nanoid(), - error: false, - loading: false, - tempFile: null, - })); - - this.filesEditList = this.filesViewList.map(file => ({ - src: file.link, - id: nanoid(), - error: "", - loading: false, - name: file.name, - size: file.size, - type: file.mimeType, - tempFile: null, - })); - } - - imagesViewList: FileModel[] = []; - filesViewList: FileModel[] = []; - - @ViewChild("newsTextEl") newsTextEl?: ElementRef; - - ngAfterViewInit(): void { - const newsTextElem = this.newsTextEl?.nativeElement; - this.newsTextExpandable = newsTextElem?.clientHeight < newsTextElem?.scrollHeight; - - this.cdRef.detectChanges(); - } - - onCopyLink(): void { - const programId = this.route.snapshot.params["programId"]; - - navigator.clipboard - .writeText(`https://app.procollab.ru/office/program/${programId}/news/${this.newsItem.id}`) - .then(() => { - this.snackbarService.success("Ссылка скопирована"); - }); - } - - imagesEditList: { - id: string; - src: string; - loading: boolean; - error: boolean; - tempFile: File | null; - }[] = []; - - filesEditList: { - id: string; - src: string; - loading: boolean; - error: string; - name: string; - size: number; - type: string; - tempFile: File | null; - }[] = []; - - onUploadFile(event: Event) { - const files = (event.currentTarget as HTMLInputElement).files; - if (!files) return; - - const observableArray: Observable[] = []; - for (let i = 0; i < files.length; i++) { - const fileType = files[i].type.split("/")[0]; - - if (fileType === "image") { - const fileObj: ProgramNewsCardComponent["imagesEditList"][0] = { - id: nanoid(2), - src: "", - loading: true, - error: false, - tempFile: files[0], - }; - this.imagesEditList.push(fileObj); - - observableArray.push( - this.fileService.uploadFile(files[i]).pipe( - tap(file => { - fileObj.src = file.url; - fileObj.loading = false; - - if (fileObj.tempFile) { - this.imagesViewList.push({ - name: fileObj.tempFile.name, - size: fileObj.tempFile.size, - mimeType: fileObj.tempFile.type, - link: fileObj.src, - datetimeUploaded: "", - extension: "", - user: 0, - }); - } - - fileObj.tempFile = null; - }) - ) - ); - } else { - const fileObj: ProgramNewsCardComponent["filesEditList"][0] = { - id: nanoid(2), - loading: true, - error: "", - src: "", - tempFile: files[0], - name: "", - size: 0, - type: "", - }; - this.filesEditList.push(fileObj); - - observableArray.push( - this.fileService.uploadFile(files[i]).pipe( - tap(file => { - fileObj.loading = false; - fileObj.src = file.url; - - if (fileObj.tempFile) { - this.filesViewList.push({ - name: fileObj.tempFile.name, - size: fileObj.tempFile.size, - mimeType: fileObj.tempFile.type, - link: fileObj.src, - datetimeUploaded: "", - extension: "", - user: 0, - }); - } - }) - ) - ); - } - } - - forkJoin(observableArray).subscribe(noop); - // const fileObj: NewsCardComponent["imagesEditList"][0] = { - // id: nanoid(2), - // src: "", - // loading: true, - // error: false, - // tempFile: files[0], - // }; - // this.imagesEditList.push(fileObj); - // this.fileService.uploadFile(files[0]).subscribe({ - // next: file => { - // fileObj.src = file.url; - // fileObj.loading = false; - // - // fileObj.tempFile = null; - // }, - // error: () => { - // fileObj.error = true; - // fileObj.loading = false; - // }, - // }); - } - - onDeletePhoto(fId: string) { - const fileIdx = this.imagesEditList.findIndex(f => f.id === fId); - - if (this.imagesEditList[fileIdx].src) { - this.imagesEditList[fileIdx].loading = true; - this.fileService.deleteFile(this.imagesEditList[fileIdx].src).subscribe(() => { - this.imagesEditList.splice(fileIdx, 1); - }); - } else { - this.imagesEditList.splice(fileIdx, 1); - } - } - - onDeleteFile(fId: string) { - const fileIdx = this.filesEditList.findIndex(f => f.id === fId); - - if (this.filesEditList[fileIdx].src) { - this.filesEditList[fileIdx].loading = true; - this.fileService.deleteFile(this.filesEditList[fileIdx].src).subscribe(() => { - this.filesEditList.splice(fileIdx, 1); - }); - } else { - this.filesEditList.splice(fileIdx, 1); - } - } - - onRetryUpload(id: string) { - const fileObj = this.imagesEditList.find(f => f.id === id); - if (!fileObj || !fileObj.tempFile) return; - - fileObj.loading = true; - fileObj.error = false; - - this.fileService.uploadFile(fileObj.tempFile).subscribe({ - next: file => { - fileObj.src = file.url; - fileObj.loading = false; - - fileObj.tempFile = null; - }, - error: () => { - fileObj.error = true; - fileObj.loading = false; - }, - }); - } - - showLikes: boolean[] = []; - - lastTouch = 0; - onTouchImg(_event: TouchEvent, imgIdx: number) { - if (Date.now() - this.lastTouch < 300) { - this.like.emit(this.newsItem.id); - this.showLikes[imgIdx] = true; - - setTimeout(() => { - this.showLikes[imgIdx] = false; - }, 1000); - } - - this.lastTouch = Date.now(); - } - - onExpandNewsText(elem: HTMLElement, expandedClass: string, isExpanded: boolean): void { - expandElement(elem, expandedClass, isExpanded); - this.readMore = !isExpanded; - } -} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html index 91471ba8..c2291a1e 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html @@ -4,275 +4,46 @@
@if (projectBoardInfo(); as projectBoardInfo) { - } @for (boardColumn of boardColumns(); track $index) { -
-
-

{{ boardColumn.tasks.length }}

-
- @if (boardColumn.locked) { - - } -

{{ boardColumn.name }}

-
- -
- -
- @for (task of boardColumn.tasks; track task.id) { - - } -
- - -
- } @if (isTaskDetailOpen()) { -
-
- прикрепить результат -
- -
-
-
- -
-

Настроить процессы

- -
- -
-
- -

Федор Е

-
- -

12.10.2025 21:00

-
- -
- divider image -
- -
- @if (taskDetailForm.get("responsible"); as responsible) { -
-
- -
ответственный
-
- -
- @if (responsible.value) { - -

{{ responsible.value.name }}

- } @else { -
- -
- } -
-
- } @if (taskDetailForm.get("performers"); as performers) { -
-
- -
исполнители
-
- -
- @if (performers.value.length > 0) { -
- @for (performer of performers.value; track $index) { - - } -
- } @else { -
- -
- } -
-
- } @if (taskDetailForm.get("startDate"); as startDate) { -
-
- -

начало

-
- -
-

{{ startDate.value || todayDate | date: "dd.MM.yy" }}

- - закончена -
-
- } @if (taskDetailForm.get("deadline"); as deadline) { -
-
- -

дедлайн

-
- -
-

{{ deadline.value || tommorowDate | date: "dd.MM.yy" }}

- - 10 дней -
-
- } -
- -
- @if (taskDetailForm.get("tags"); as tags) { -
-
- -

тег

-
- - @if (tags.value.length > 0) { -
- @for (tag of tags.value; track $index) { - {{ "#" + tag.name }} + } +
+ @for (boardColumn of boardColumns(); track $index) { +
+
+

{{ boardColumn.tasks.length }}

+
+ @if (boardColumn.locked) { + } +

{{ boardColumn.name }}

- } @else { -
- -
- } -
- } @if (taskDetailForm.get("goal"); as goal) { -
-
- -

цель

-
- - @if (goal.value) { - {{ - goal.value.name.length > 20 ? goal.value.name.slice(0, 15) + "..." : goal.value.name - }} - } @else { -
- -
- } +
- } @if (taskDetailForm.get("skills"); as skills) { -
-
- -

навыки

-
- @if (skills.value.length > 0) { -
- @for (skill of skills.value; track $index) { - {{ skill.name }} - } -
- } @else { -
- -
+
+ @for (task of boardColumn.tasks; track task.id) { + }
- } -
-
- divider image -
- - @if (taskDetailForm.get("description"); as description) { -
-
- @if (isChangeDescriptionText() && description.value) { -

- @if (descriptionExpandable) { -
- {{ readFullDescription ? "cкрыть" : "подробнее" }} -
- } } @else { - - } -
+
} -
- @if (taskDetailForm.get("files"); as files) { @if (files.value.length >= 0 && - files.value.length <= 3) { @for (file of files.value; track $index) { - - } @if (!(files.value.length === 3)) { -
-
- -
- -

файл

+
+
+
- } } } -
- -
- -
-
- - -
- - -
- -
-
- @for (f of filesList; track f.id) { - - } - -
-
+ + @if (isTaskDetailOpen()) { + }
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index abf715b7..e5cfe76f 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -1,18 +1,21 @@ -@use "styles/typography"; + .kanban { &__wrapper { position: relative; display: grid; - grid-template-columns: 1fr 3fr 3fr 3fr; + grid-template-columns: 1fr 9fr; grid-gap: 20px; } &__column { - i, - p { - color: var(--accent); - cursor: pointer; + flex: 0 0 calc(33.333% - 14px); + min-width: calc(33.333% - 14px); + + &-wrapper { + display: flex; + gap: 20px; + overflow-y: hidden; } &-locked { @@ -28,315 +31,33 @@ padding: 5px 12px; border: 0.5px solid var(--accent); border-radius: var(--rounded-xl); - } - - &--add-task { - display: flex; - align-items: center; - align-self: center; - justify-content: center; - margin-top: 20px; - } - } - - &__tasks { - display: flex; - flex-direction: column; - gap: 20px; - align-items: center; - margin-top: 20px; - } - - &__detail { - position: absolute; - top: 0%; - right: 0%; - width: 100%; - max-width: 422px; - padding: 24px; - background-color: var(--light-white); - border: 0.5px solid var(--medium-grey-for-outline); - border-radius: var(--rounded-lg); - - &-top { - display: flex; - align-items: center; - justify-content: space-between; - margin-bottom: 24px; - - &-menu { - display: flex; - gap: 10px; - align-items: center; - } - } - - &-priority { - width: 15px; - height: 15px; - background-color: var(--green); - border-radius: var(--rounded-xxl); - } - &-general { - display: flex; - align-items: center; - justify-content: space-between; - margin-bottom: 10px; - margin-bottom: 5px; - border-bottom: 0.5px solid var(--accent); - - p { - color: var(--accent) !important; - } - } - - p { color: var(--grey-for-text); } - - &-info { - display: flex; - gap: 10px; - align-items: flex-start; - margin-top: 15px; - - &-name { - display: flex; - gap: 3px; - align-items: center; - - &--date { - display: flex; - gap: 3px; - align-items: center; - - p, - i { - color: var(--green-dark) !important; - } - } - - h6 { - color: var(--accent); - } - } - - &-list { - display: flex; - flex-direction: column; - gap: 4px; - } - } - - &-info-wrapper { - display: flex; - flex-direction: column; - gap: 5px; - } - - &-add-responsible { - padding: 8px; - cursor: pointer; - border: 0.5px dashed var(--accent); - border-radius: var(--rounded-xxl); - } - - &-performers { - display: flex; - gap: 4px; - align-items: center; - margin-left: 12px; - - app-avatar { - margin-left: -12px; + &--empty { + cursor: pointer; + justify-content: center; } } - &-add-object { + &--add-task { display: flex; align-items: center; align-self: center; justify-content: center; - width: 100%; - padding: 2px 48px; - cursor: pointer; - border: 0.5px solid var(--accent); - border-radius: var(--rounded-xl); - } - - &-description { - ::ng-deep { - app-textarea { - .field__input { - min-height: 45px; - padding: 12px 12px 0; - margin-left: -10px; - background-color: transparent; - border: none; - border-radius: 0; - - &:focus { - border-color: none; - box-shadow: none; - } - } - } - } - } - - &-files { - display: flex; - gap: 10px; - align-items: center; - margin-bottom: 40px; - } - - &-file { - width: 116px; - - &--empty { - display: flex; - gap: 5px; - align-items: center; - } - } - - i { - color: var(--accent); - } - } - - &__divider { - width: 100%; - margin-top: 5px; - } -} - -.about { - /* stylelint-disable value-no-vendor-prefix */ - &__text { - p { - display: -webkit-box; - overflow: hidden; - color: var(--grey-for-text); - text-overflow: ellipsis; - -webkit-box-orient: vertical; - -webkit-line-clamp: 5; - transition: all 0.7s ease-in-out; - - &.expanded { - -webkit-line-clamp: unset; - } + margin-top: 20px; } - ::ng-deep a { + i, p { color: var(--accent); - text-decoration: underline; - text-decoration-color: transparent; - text-underline-offset: 3px; - transition: text-decoration-color 0.2s; - - &:hover { - text-decoration-color: var(--accent); - } - } - } - - /* stylelint-enable value-no-vendor-prefix */ - - &__read-full { - margin-top: 2px; - color: var(--accent); - cursor: pointer; - } -} - -.read-more { - margin-top: 12px; - color: var(--accent); - cursor: pointer; - transition: color 0.2s; - - &:hover { - color: var(--accent-dark); - } -} - -.form { - display: flex; - align-items: center; - justify-content: space-between; - width: 422px; - height: 28px; - padding: 10px 24px; - margin-bottom: -25px; - margin-left: -25px; - background-color: var(--light-white); - border: 0.5px solid var(--medium-grey-for-outline); - border-radius: var(--rounded-lg); - - &__row { - display: flex; - align-items: center; - width: 100%; - - ::ng-deep { - app-input { - .field__input { - width: 100%; - color: var(--grey-for-text) !important; - background-color: transparent; - - @include typography.body-10; - } - } + cursor: pointer; } } - &__files { + &__tasks { display: flex; flex-direction: column; - gap: 10px; - - &:not(:empty) { - margin-top: 20px; - } - } - - &__actions { - display: flex; - gap: 5px; + gap: 20px; align-items: center; - - i { - color: var(--light-white); - } - - input { - display: none; - } - } - - &__attach { - i { - color: var(--dark-grey); - } - } - - &__send { - width: 15px; - height: 15px; - padding: 4px; - color: var(--accent); - cursor: pointer; - background-color: var(--accent); - border-radius: 3px; - } - - &__input { - flex-grow: 1; - resize: none; - background: transparent; - border: none; - outline: none; + margin-top: 20px; + overflow-y: scroll; } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts index f44e5783..5b924209 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -1,33 +1,16 @@ /** @format */ -import { CommonModule, DatePipe } from "@angular/common"; -import { - ChangeDetectorRef, - Component, - ElementRef, - inject, - OnDestroy, - OnInit, - signal, - ViewChild, -} from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; import { Subscription } from "rxjs"; import { ProjectDataService } from "../services/project-data.service"; import { Project } from "@office/models/project.model"; import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; import { ActivatedRoute, Router } from "@angular/router"; -import { IconComponent, ButtonComponent, InputComponent } from "@ui/components"; +import { IconComponent } from "@ui/components"; import { KanbanTaskComponent } from "./shared/task/kanban-task.component"; import { ClickOutsideModule } from "ng-click-outside"; -import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { TagComponent } from "@ui/components/tag/tag.component"; -import { expandElement } from "@utils/expand-element"; -import { ParseBreaksPipe, ParseLinksPipe } from "@corelib"; -import { FileItemComponent } from "@ui/components/file-item/file-item.component"; -import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; -import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { TextareaComponent } from "@ui/components/textarea/textarea.component"; -import { BadgeComponent } from "@ui/components/badge/badge.component"; +import { TaskDetailComponent } from "./shared/task/detail/task-detail.component"; @Component({ selector: "app-kanban-board", @@ -39,59 +22,19 @@ import { BadgeComponent } from "@ui/components/badge/badge.component"; IconComponent, KanbanTaskComponent, ClickOutsideModule, - ButtonComponent, - AvatarComponent, - TagComponent, - ParseBreaksPipe, - ParseLinksPipe, - FileItemComponent, - InputComponent, - FileUploadItemComponent, - ReactiveFormsModule, - DatePipe, - TextareaComponent, - BadgeComponent, + TaskDetailComponent, ], standalone: true, }) export class KanbanBoardComponent implements OnInit, OnDestroy { - @ViewChild("descEl") descEl?: ElementRef; - private readonly projectDataService = inject(ProjectDataService); private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); - private readonly cdRef = inject(ChangeDetectorRef); private subscriptions: Subscription[] = []; - constructor(private readonly fb: FormBuilder) { - this.taskDetailForm = this.fb.group({ - title: ["", Validators.required], - responsible: [null], - performers: this.fb.array([]), - startDate: [null], - deadline: [null], - tags: this.fb.array([]), - goal: [null], - skills: this.fb.array([]), - description: [null], - files: this.fb.array([]), - }); - } - projectBoardInfo = signal(null); boardColumns = signal([]); isTaskDetailOpen = signal(false); - isChangeDescriptionText = signal(false); - - descriptionExpandable!: boolean; // Флаг необходимости кнопки "Читать полностью" - readFullDescription = false; // Флаг показа всех вакансий - - filesList: any[] = []; - - todayDate = new Date(); - tommorowDate = new Date().setDate(this.todayDate.getDate() + 1); - - taskDetailForm: FormGroup; ngOnInit(): void { const detailInfoUrl$ = this.route.queryParams.subscribe({ @@ -153,13 +96,6 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.boardColumns.set(mockColumns); } - /** - * Проверка возможности расширения описания после инициализации представления - */ - ngAfterViewInit(): void { - this.checkDescriptionHeigth(); - } - ngOnDestroy(): void { this.subscriptions.forEach($ => $.unsubscribe()); } @@ -182,29 +118,4 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { }); this.isTaskDetailOpen.set(false); } - - onChangeText(event: MouseEvent): void { - event.stopPropagation(); - this.isChangeDescriptionText.set(!this.isChangeDescriptionText()); - - setTimeout(() => this.checkDescriptionHeigth(), 0); - } - - /** - * Раскрытие/сворачивание описания профиля - * @param elem - DOM элемент описания - * @param expandedClass - CSS класс для раскрытого состояния - * @param isExpanded - текущее состояние (раскрыто/свернуто) - */ - onExpandDescription(elem: HTMLElement, expandedClass: string, isExpanded: boolean): void { - expandElement(elem, expandedClass, isExpanded); - this.readFullDescription = !isExpanded; - } - - private checkDescriptionHeigth(): void { - const descElement = this.descEl?.nativeElement; - this.descriptionExpandable = descElement?.clientHeight < descElement?.scrollHeight; - - this.cdRef.detectChanges(); - } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts index c67156a0..ccd279e2 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts @@ -2,6 +2,8 @@ import { inject, Injectable } from "@angular/core"; import { ApiService } from "@corelib"; +import { TaskDetail } from "./models/task.model"; +import { Observable } from "rxjs"; @Injectable({ providedIn: "root", @@ -18,7 +20,7 @@ export class KanbanBoardService { return this.apiService.get(`${this.KANBAN_BOARD_URL}/`); } - getTaskById(taskId: number) { - return this.apiService.get(`${this.KANBAN_BOARD_URL}/`); + getTaskById(taskId: number): Observable { + return this.apiService.get(`${this.KANBAN_BOARD_URL}/`); } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts index dccffc93..78ebff94 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts @@ -10,14 +10,14 @@ import { Column } from "./column.model"; export interface TaskPreview { id: number; columnId: Column["id"]; - name: string; + title: string; priority: number; description: string; deadlineDate: string; - tag: Tag; - Goal: Goal; + tags: Tag[]; + goal: Goal; type: string; - file: FileModel; + files: FileModel; responsible: { id: User["id"]; avatar: User["avatar"]; @@ -39,7 +39,10 @@ export interface TaskDetail extends TaskPreview { datetimeCreated: string; dateTaskStart: string; requiredSkills: Skill[]; - projectGoal: Goal["title"]; + projectGoal: { + id: Goal["id"]; + title: Goal["title"]; + }; } export interface TaskResult { diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html new file mode 100644 index 00000000..a1358ec0 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html @@ -0,0 +1,31 @@ + + +
+ +
+ + @if (openPickColors) { +
+
+ @for (colorItem of tagColors; track $index) { +
+ } +
+
+ } +
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss new file mode 100644 index 00000000..d72879c1 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss @@ -0,0 +1,71 @@ +.create-tag { + &__form { + display: flex; + align-items: center; + gap: 5px; + } + + &__pick-color { + border-radius: var(--rounded-sm); + height: 9px; + width: 9px; + position: relative; + cursor: pointer; + } + + &__input { + padding: 3px 2px 2px 10px; + outline: none; + transition: all 0.2s; + + &::placeholder { + color: var(--dark-grey); + } + + &:focus { + border-color: var(--accent); + } + } + + &__colors { + position: absolute; + bottom: -25%; + right: -12%; + padding: 7px; + background-color: var(--light-white); + border-radius: var(--rounded-md); + border: 0.5px solid var(--medium-grey-for-outline); + + &-wrapper { + display: grid; + grid-template-columns: repeat(4, 1fr); + grid-template-rows: repeat(2, 1fr); + gap: 3px; + } + } +} + +.field { + &__option { + display: flex; + align-items: center; + justify-content: space-between; + cursor: pointer; + gap: 5px; + transition: color 0.2s ease-in-out; + + &--add-object { + display: flex; + align-items: center; + justify-content: center; + width: 80px; + cursor: pointer; + border: 0.5px solid var(--accent); + border-radius: var(--rounded-xl); + + i { + color: var(--accent); + } + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts new file mode 100644 index 00000000..9409a5a8 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts @@ -0,0 +1,61 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, EventEmitter, inject, Output } from "@angular/core"; +import { tagColorsList } from "projects/core/src/consts/lists/tag-colots.list.const"; +import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from "@angular/forms"; + +@Component({ + selector: "app-create-tag-form", + templateUrl: "./create-tag-form.component.html", + styleUrl: "./create-tag-form.component.scss", + imports: [CommonModule, FormsModule, ReactiveFormsModule], + standalone: true, +}) +export class CreateTagFormComponent { + @Output() createTag = new EventEmitter<{ name: string; color: string }>(); + + private readonly fb = inject(FormBuilder); + + constructor() { + this.tagForm = this.fb.group({ + tagName: [""], + tagColor: [tagColorsList[0].color], + }); + } + + tagForm: FormGroup; + openPickColors = false; + + get tagColors() { + return tagColorsList; + } + + get selectedColor(): string { + return this.tagForm.get("tagColor")?.value || tagColorsList[0].color; + } + + selectTagColor(color: string) { + this.tagForm.patchValue({ tagColor: color }); + this.openPickColors = false; + } + + confirmCreateTag(event: Event) { + event.stopPropagation(); + event.preventDefault(); + + const { tagName, tagColor } = this.tagForm.value; + + if (!tagName?.trim() || !tagColor) return; + + this.createTag.emit({ + name: tagName, + color: tagColor, + }); + + this.tagForm.reset({ + tagName: "", + tagColor: tagColorsList[0].color, + }); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html index 93f54a17..8a82eba8 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html @@ -1,9 +1,23 @@ -
+
@if (projectBoardInfo) {
- +
+ +
+ +
} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss index 70efd18d..93bd6b89 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss @@ -1,5 +1,6 @@ .kanban { &__sidebar { + position: relative; display: flex; flex-direction: column; gap: 15px; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts index 39730f99..8323cf32 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts @@ -1,18 +1,61 @@ /** @format */ import { CommonModule } from "@angular/common"; -import { Component, Input } from "@angular/core"; +import { ChangeDetectorRef, Component, inject, Input, signal } from "@angular/core"; import { Project } from "@office/models/project.model"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { KanbanBoardActionsComponent } from "../actions/kanban-board-actions.component"; +import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; +import { ClickOutsideModule } from "ng-click-outside"; @Component({ selector: "app-kanban-board-sidebar", templateUrl: "./kanban-board-sidebar.component.html", styleUrl: "./kanban-board-sidebar.component.scss", - imports: [CommonModule, AvatarComponent, KanbanBoardActionsComponent], + imports: [ + CommonModule, + AvatarComponent, + KanbanBoardActionsComponent, + DropdownComponent, + ClickOutsideModule, + ], standalone: true, }) export class KanbanBoardSidebarComponent { @Input({ required: true }) projectBoardInfo!: Project; + + isContextMenuOpen = signal(false); + + onMouseDown(event: MouseEvent, projectBoardInfo: Project): void { + event.stopPropagation(); + + if (event.button === 2 || event.ctrlKey) { + event.preventDefault(); + this.isContextMenuOpen.set(true); + return; + } + + if (event.button === 0) { + this.navigateToDifferentBoard(projectBoardInfo); + } + } + + private navigateToDifferentBoard(projectBoardInfo: Project): void { + console.log(projectBoardInfo.id); + } + + get contextMenuOptions() { + return [ + { + id: 1, + label: "выгрузить", + value: "", + }, + { + id: 2, + label: "архив выполнено", + value: "", + }, + ]; + } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html new file mode 100644 index 00000000..e1d6829a --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html @@ -0,0 +1,448 @@ + + +
+
+ прикрепить результат +
+
+ + +
+ +
+
+ +
+ +
+ + +
+
+
+ +
+ @if (taskDetailForm.get("title")?.value; as title) { +

{{ title }}

+ } + +
+ +
+
+ +

Федор Е

+
+ +

12.10.2025 21:00

+
+ +
+ divider image +
+ +
+ @if (taskDetailForm.get("responsible"); as responsible) { +
+
+ +
ответственный
+
+ +
+ @if (responsible.value) { +
+ + + @if (showEditAvatarIcon) { + + } + + +
+ +

{{ responsible.value.name }}

+ } @else { +
+ + +
+ } +
+
+ } @if (taskDetailForm.get("performers"); as performers) { +
+
+ +
исполнители
+
+ +
+ @if (performers.value.length >= 0 && performers.value.length <= 3) { +
+ @for (performer of performers.value; track $index) { + + } +
+ } @if (!(performers.value.length === 3)) { +
+ + +
+ } +
+
+ } @if (taskDetailForm.get("startDate"); as startDate) { +
+
+ +

начало

+
+ +
+ @if (!showEditStartDatePicker) { +

+ {{ startDate.value | date: "dd.MM.yy" }} +

+ } @else { + + } + + {{ statusOfTask.text }} +
+
+ } @if (taskDetailForm.get("deadline"); as deadline) { +
+
+ +

дедлайн

+
+ +
+ @if (!showEditDeadlineDatePicker) { +

+ {{ deadline.value | date: "dd.MM.yy" }} +

+ } @else { + + } + + {{ + remainingDaysDeadline() + + " " + + (remainingDaysDeadline() | pluralize: ["день", "дня", "дней"]) + }} +
+
+ } +
+ +
+ @if (taskDetailForm.get("tags"); as tags) { +
+
+ +

тег

+
+ + @if (tags.value.length > 0) { +
+ @for (tag of tags.value; track $index) { + {{ "#" + tag.name }} + } +
+ } @else { +
+ + +
+ } +
+ } @if (taskDetailForm.get("goal"); as goal) { +
+
+ +

цель

+
+ + @if (goal.value) { + {{ + goal.value.name.length > 20 ? goal.value.name.slice(0, 15) + "..." : goal.value.name + }} + } @else { +
+ +
+ } + +
+ } @if (taskDetailForm.get("skills"); as skills) { +
+
+ +

навыки

+
+ + @if (skills.value.length > 0) { +
+ @for (skill of skills.value; track $index) { + {{ + skill.name + }} + } +
+ } @else { +
+ + + +
+

библиотека навыков

+
+
+
    + @for (skillsGroup of nestedSkills$ | async; track skillsGroup.id) { +
  • + +
    • + } +
+
+
+ cохранить +
+ +
+ } +
+ } +
+ +
+ divider image +
+ + @if (taskDetailForm.get("description"); as description) { +
+
+ @if (isChangeDescriptionText() && description.value) { +

+ @if (descriptionExpandable) { +
+ {{ readFullDescription ? "cкрыть" : "подробнее" }} +
+ } } @else { + + } +
+
+ } + +
+ @if (taskDetailForm.get("files"); as files) { @if (files.value.length >= 0 && files.value.length + <= 3) { @for (file of files.value; track $index) { + + } @if (!(files.value.length === 3)) { +
+ + +

файл

+
+ } } } +
+ +
+ +
+
+ + +
+ + +
+ +
+
+ @for (f of filesList; track f.id) { + + } + +
+
+
+
diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss new file mode 100644 index 00000000..0acc66ae --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -0,0 +1,395 @@ +@use "styles/typography"; + +.kanban { + &__detail { + position: absolute; + top: 0%; + right: 0%; + width: 100%; + max-width: 422px; + padding: 24px; + background-color: var(--light-white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + + &-top { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 24px; + + &-menu { + display: flex; + gap: 10px; + align-items: center; + } + } + + &-type, &-priority-wrapper, &-delete-wrapper { + cursor: pointer; + } + + &-priority { + width: 15px; + height: 15px; + background-color: var(--green); + border-radius: var(--rounded-xxl); + + } + + &-general { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + margin-bottom: 5px; + border-bottom: 0.5px solid var(--accent); + + p { + color: var(--accent) !important; + } + } + + p { color: var(--grey-for-text); } + + &-info { + display: flex; + gap: 10px; + align-items: flex-start; + margin-top: 15px; + + &-name { + display: flex; + gap: 3px; + align-items: center; + + ::ng-deep { + app-input { + + .field { + width: 44px !important; + height: 23px !important; + } + + .field__input { + border: 0; + background: transparent; + border-radius: 0; + padding: 0; + max-width: 44px; + + &:focus { + border-color: 0; + box-shadow: none; + } + + @include typography.body-10; + } + } + } + + &--date { + display: flex; + gap: 3px; + align-items: center; + + p, + i { + color: var(--green-dark) !important; + } + } + + h6 { + color: var(--accent); + } + + p { + color: var(--accent); + } + } + + &-list { + display: flex; + flex-direction: column; + gap: 4px; + } + } + + &-info-wrapper { + display: flex; + flex-direction: column; + gap: 5px; + } + + &-add-responsible { + padding: 8px; + cursor: pointer; + border: 0.5px dashed var(--accent); + border-radius: var(--rounded-xxl); + } + + &-avatar { + position: relative; + cursor: pointer; + + i { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + color: var(--light-white) !important; + } + } + + &-performers { + display: flex; + gap: 4px; + align-items: center; + margin-left: 12px; + + app-avatar { + margin-left: -12px; + } + } + + &-add-object { + display: flex; + align-items: center; + align-self: center; + justify-content: center; + width: 100%; + padding: 2px 48px; + cursor: pointer; + border: 0.5px solid var(--accent); + border-radius: var(--rounded-xl); + + ::ng-deep { + app-tag { + .tag { + max-width: 100px; + } + } + } + } + + &-description { + margin: 12px 0px; + + ::ng-deep { + app-textarea { + .field__input { + min-height: 40px; + padding: 12px 12px 0; + margin-left: -10px; + background-color: transparent; + border: none; + border-radius: 0; + + &:focus { + border-color: none; + box-shadow: none; + } + } + } + } + } + + &-files { + display: flex; + gap: 10px; + align-items: center; + margin-bottom: 40px; + } + + &-file { + width: 116px; + + &--empty { + display: flex; + gap: 5px; + align-items: center; + } + } + + i { + color: var(--accent); + } + } + + &__divider { + width: 100%; + margin-top: 5px; + } +} + +.about { + /* stylelint-disable value-no-vendor-prefix */ + &__text { + p { + display: -webkit-box; + overflow: hidden; + color: var(--grey-for-text); + text-overflow: ellipsis; + -webkit-box-orient: vertical; + -webkit-line-clamp: 5; + transition: all 0.7s ease-in-out; + + &.expanded { + -webkit-line-clamp: unset; + } + } + + ::ng-deep a { + color: var(--accent); + text-decoration: underline; + text-decoration-color: transparent; + text-underline-offset: 3px; + transition: text-decoration-color 0.2s; + + &:hover { + text-decoration-color: var(--accent); + } + } + } + + /* stylelint-enable value-no-vendor-prefix */ + + &__read-full { + margin-top: 2px; + color: var(--accent); + cursor: pointer; + } +} + +.read-more { + margin-top: 12px; + color: var(--accent); + cursor: pointer; + transition: color 0.2s; + + &:hover { + color: var(--accent-dark); + } +} + +.form { + display: flex; + align-items: center; + justify-content: space-between; + width: 422px; + height: 28px; + padding: 10px 24px; + margin-bottom: -25px; + margin-left: -25px; + background-color: var(--light-white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + + &__row { + display: flex; + align-items: center; + width: 100%; + + ::ng-deep { + app-input { + .field__input { + width: 100%; + color: var(--grey-for-text) !important; + background-color: transparent; + } + } + } + } + + &__files { + display: flex; + flex-direction: column; + gap: 10px; + + &:not(:empty) { + margin-top: 20px; + } + } + + &__actions { + display: flex; + gap: 5px; + align-items: center; + + i { + color: var(--light-white); + } + + input { + display: none; + } + } + + &__attach { + i { + color: var(--dark-grey); + } + } + + &__send { + width: 15px; + height: 15px; + padding: 4px; + color: var(--accent); + cursor: pointer; + background-color: var(--accent); + border-radius: var(--rounded-sm) + } + + &__input { + flex-grow: 1; + resize: none; + background: transparent; + border: none; + outline: none; + } +} + +.modal { + &__wrapper { + display: flex; + flex-direction: column; + gap: 20px; + align-items: center; + width: 672px; + } + + &__content { + display: flex; + flex-direction: column; + gap: 20px; + width: 100%; + max-width: 536px; + height: 480px; + background-color: var(--white); + border: 1px solid var(--medium-grey-for-outline); + border-radius: 8px; + box-shadow: 5px 5px 25px 0 var(--gray-for-shadow); + } + + &__specs-groups, + &__skills-groups { + height: 100%; + overflow: auto; + scrollbar-width: thin; + + ul { + display: flex; + flex-direction: column; + gap: 20px; + padding: 14px; + } + + li { + display: flex; + align-items: center; + justify-content: space-between; + cursor: pointer; + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts new file mode 100644 index 00000000..8448506c --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts @@ -0,0 +1,432 @@ +/** @format */ + +import { CommonModule, DatePipe } from "@angular/common"; +import { + AfterViewInit, + ChangeDetectorRef, + Component, + computed, + ElementRef, + inject, + Input, + OnInit, + signal, + ViewChild, +} from "@angular/core"; +import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; +import { InputComponent, ButtonComponent } from "@ui/components"; +import { FileItemComponent } from "@ui/components/file-item/file-item.component"; +import { TextareaComponent } from "@ui/components/textarea/textarea.component"; +import { TagComponent } from "@ui/components/tag/tag.component"; +import { BadgeComponent } from "@ui/components/badge/badge.component"; +import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; +import { ControlErrorPipe, ParseBreaksPipe, ParseLinksPipe, PluralizePipe } from "@corelib"; +import { expandElement } from "@utils/expand-element"; +import { IconComponent } from "@uilib"; +import { nanoid } from "nanoid"; +import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; +import { priorityInfoList } from "projects/core/src/consts/lists/priority-info-list.const"; +import { ClickOutsideModule } from "ng-click-outside"; +import { actionTypeList } from "projects/core/src/consts/lists/actiion-type-list.const"; +import { Project } from "@office/models/project.model"; +import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.component"; +import { ModalComponent } from "@ui/components/modal/modal.component"; +import { SkillsService } from "@office/services/skills.service"; +import { Skill } from "@office/models/skill"; +import { Subscription } from "rxjs"; +import { TaskDetail } from "../../../models/task.model"; +import { daysUntil } from "@utils/days-untit"; +import { KanbanBoardService } from "../../../kanban-board.service"; + +@Component({ + selector: "app-task-detail", + templateUrl: "./task-detail.component.html", + styleUrl: "./task-detail.component.scss", + imports: [ + CommonModule, + ReactiveFormsModule, + FileUploadItemComponent, + InputComponent, + IconComponent, + FileItemComponent, + TextareaComponent, + TagComponent, + BadgeComponent, + AvatarComponent, + ButtonComponent, + ParseLinksPipe, + ParseBreaksPipe, + DatePipe, + DropdownComponent, + ClickOutsideModule, + SkillsGroupComponent, + ModalComponent, + ControlErrorPipe, + PluralizePipe, + ], + standalone: true, +}) +export class TaskDetailComponent implements OnInit, AfterViewInit { + @Input() collaborators?: Project["collaborators"]; + @Input() goals?: Project["goals"]; + + @ViewChild("descEl") descEl?: ElementRef; + + private readonly kanbanBoardService = inject(KanbanBoardService); + private readonly skillsService = inject(SkillsService); + private readonly cdRef = inject(ChangeDetectorRef); + + constructor(private readonly fb: FormBuilder) { + this.taskDetailForm = this.fb.group({ + title: ["", Validators.required], + responsible: [], + performers: this.fb.array([]), + startDate: [null], + deadline: [null], + tags: this.fb.array([]), + goal: [null], + skills: this.fb.array([]), + description: [null], + files: this.fb.array([]), + priority: [null], + action: [null], + }); + } + + isChangeDescriptionText = signal(false); + + remainingDaysDeadline = signal(0); + + /** Уникальный ID для элемента input */ + controlId = nanoid(3); + + descriptionExpandable!: boolean; // Флаг необходимости кнопки "подробнее" + readFullDescription = false; // Флаг показа всех вакансий + + isActionTypeOpen = false; + isPriorityTypeOpen = false; + isDeleteTypeOpen = false; + isResponsiblePickOpen = false; + isPerformersPickOpen = false; + isGoalPickOpen = false; + isTagsPickOpen = false; + + showEditAvatarIcon = false; + showEditDeadlineDatePicker = false; + showEditStartDatePicker = false; + + skillsGroupsModalOpen = signal(false); + nestedSkills$ = this.skillsService.getSkillsNested(); + openGroupIds = new Set(); + + filesList: any[] = []; + + taskDetailForm: FormGroup; + + subscriptions: Subscription[] = []; + + get actionTypeOptions() { + return actionTypeList; + } + + get priorityTypeOptions() { + return priorityInfoList + .map(priority => ({ + id: priority.id, + label: priority.label, + value: priority.priorityType, + additionalInfo: priority.priorityType.toString(), + })) + .reverse(); + } + + get responsiblePickOpenOptions() { + return this.collaborators + ? this.collaborators.map(collaborator => ({ + id: collaborator.userId, + label: collaborator.firstName + " " + collaborator.lastName[0], + value: collaborator.userId, + additionalInfo: collaborator.avatar, + })) + : []; + } + + get goalPickOptions() { + return this.goals + ? this.goals.map((goal, index) => ({ + id: index, + label: goal.title, + value: goal.id, + additionalInfo: goal.title, + })) + : []; + } + + get tagsPickOptions() { + return [ + { + id: 1, + label: "аналитика", + value: "аналитика", + additionalInfo: "primary", + }, + { + id: 2, + label: "продажи", + value: "продажи", + additionalInfo: "complete", + }, + ]; + } + + get priorityDeleteOptions() { + return [ + { + id: 1, + label: "удалить задачу", + value: "delete", + }, + ]; + } + + get hasOpenSkillsGroups(): boolean { + return this.openGroupIds.size > 0; + } + + get statusOfTask() { + const start = new Date(this.taskDetailForm.value.startDate); + const deadline = new Date(this.taskDetailForm.value.deadline); + + const status = this.getTaskStatus(start, deadline); + + let days: number | null = null; + + if (status === "ожидание") { + days = daysUntil(start); + } else if (status === "началась") { + days = daysUntil(deadline); + } + + const color = status === "закончена" ? "red" : this.getColorByDays(days!); + + return { + text: status, + color, + }; + } + + ngOnInit(): void {} + + /** + * Проверка возможности расширения описания после инициализации представления + */ + ngAfterViewInit(): void { + const todayDate = new Date(); + const tomorrowDate = new Date(todayDate); + tomorrowDate.setDate(todayDate.getDate() + 1); + + this.initializeTaskDetailInfo(todayDate, tomorrowDate); + this.checkDescriptionHeigth(); + } + + onDeleteTaskGoal(): void {} + + onDeleteTaskTag(): void {} + + onEditTaskTag(): void {} + + getCreatedTagInfo(createdTagInfo: { name: string; color: string }): void { + console.log(createdTagInfo); + } + + toggleDropdown( + type: "action" | "priority" | "responsible" | "performers" | "goal" | "tags" | "delete", + state: boolean + ) { + switch (type) { + case "action": + this.isActionTypeOpen = state; + break; + + case "priority": + this.isPriorityTypeOpen = state; + break; + + case "responsible": + this.isResponsiblePickOpen = state; + break; + + case "performers": + this.isPerformersPickOpen = state; + break; + + case "goal": + this.isGoalPickOpen = state; + break; + + case "tags": + this.isTagsPickOpen = state; + break; + + case "delete": + this.isDeleteTypeOpen = state; + break; + + default: + break; + } + } + + onTypeSelect( + typeId: number, + type: "action" | "priority" | "responsible" | "performers" | "goal" | "tags" | "delete" + ): void { + this.toggleDropdown(type, false); + console.log(typeId); + } + + onChangeText(event: MouseEvent): void { + event.stopPropagation(); + this.isChangeDescriptionText.set(!this.isChangeDescriptionText()); + + setTimeout(() => this.checkDescriptionHeigth(), 0); + } + + /** + * Раскрытие/сворачивание описания профиля + * @param elem - DOM элемент описания + * @param expandedClass - CSS класс для раскрытого состояния + * @param isExpanded - текущее состояние (раскрыто/свернуто) + */ + onExpandDescription(elem: HTMLElement, expandedClass: string, isExpanded: boolean): void { + expandElement(elem, expandedClass, isExpanded); + this.readFullDescription = !isExpanded; + } + + /** Обработчик загрузки файла */ + onUpdate(event: Event): void { + const files = (event.currentTarget as HTMLInputElement).files; + if (!files?.length) { + return; + } + + console.log("123"); + + // this.loading = true; + + // this.fileService.uploadFile(files[0]).subscribe(res => { + // this.loading = false; + + // this.value = res.url; + // this.onChange(res.url); + // }); + } + + /** + * Переключение навыка в списке выбранных + * @param toggledSkill - навык для переключения + */ + onToggleSkill(toggledSkill: Skill): void { + const { skills }: { skills: Skill[] } = this.taskDetailForm.value; + const isPresent = skills.some(skill => skill.id === toggledSkill.id); + + if (isPresent) { + this.onRemoveSkill(toggledSkill); + } else { + this.onAddSkill(toggledSkill); + } + } + + onGroupToggled(isOpen: boolean, skillsGroupId: number): void { + this.openGroupIds.clear(); + if (isOpen) { + this.openGroupIds.add(skillsGroupId); + } + + this.cdRef.markForCheck(); + } + + /** + * Переключение модального окна групп навыков + */ + toggleSkillsGroupsModal(): void { + this.skillsGroupsModalOpen.update(open => !open); + } + + /** + * Добавление навыка + * @param newSkill - новый навык + */ + private onAddSkill(newSkill: Skill): void { + const { skills }: { skills: Skill[] } = this.taskDetailForm.value; + const isPresent = skills.some(skill => skill.id === newSkill.id); + + if (isPresent) return; + + this.taskDetailForm.patchValue({ skills: [newSkill, ...skills] }); + } + + /** + * Удаление навыка + * @param oddSkill - навык для удаления + */ + private onRemoveSkill(oddSkill: Skill): void { + const { skills }: { skills: Skill[] } = this.taskDetailForm.value; + + this.taskDetailForm.patchValue({ + skills: skills.filter(skill => skill.id !== oddSkill.id), + }); + } + + private checkDescriptionHeigth(): void { + const descElement = this.descEl?.nativeElement; + this.descriptionExpandable = descElement?.clientHeight < descElement?.scrollHeight; + + this.cdRef.detectChanges(); + } + + private initializeTaskDetailInfo(todayDate: Date, tommorowDate: Date): void { + const taskDetailInfo$ = this.kanbanBoardService.getTaskById(123).subscribe({ + next: (taskDetailInfo: TaskDetail) => { + this.taskDetailForm.patchValue({ + title: taskDetailInfo.title ?? "Настроить процессы", + responsible: taskDetailInfo.responsible ?? null, + performers: taskDetailInfo.performers ?? [], + startDate: taskDetailInfo.dateTaskStart ?? todayDate, + deadline: taskDetailInfo.deadlineDate + ? new Date(taskDetailInfo.deadlineDate) + : tommorowDate, + tags: taskDetailInfo.tags ?? [], + goal: taskDetailInfo.goal ?? null, + skills: taskDetailInfo.requiredSkills ?? [], + description: taskDetailInfo.description ?? null, + files: taskDetailInfo.files ?? [], + }); + this.remainingDaysDeadline.set( + daysUntil( + taskDetailInfo.deadlineDate + ? new Date(taskDetailInfo.deadlineDate) + : new Date(tommorowDate) + ) + ); + }, + }); + + this.subscriptions.push(taskDetailInfo$); + } + + private getColorByDays(days: number): "red" | "gold" | "green" { + if (days <= 3) return "red"; + if (days <= 7) return "gold"; + return "green"; + } + + private getTaskStatus(start: Date, deadline: Date) { + const now = new Date(); + + if (now < start) return "ожидание"; + if (now > deadline) return "закончена"; + return "началась"; + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts index e18cecef..d7136c98 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts @@ -5,36 +5,18 @@ import { Component, Input } from "@angular/core"; import { IconComponent } from "@uilib"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { TagComponent } from "@ui/components/tag/tag.component"; -import { hexToRgba } from "@utils/helpers/hexToRgba"; -import { priorityInfoList } from "projects/core/src/consts/lists/priority-info-list.const"; -import { RouterLink } from "@angular/router"; +import { RouterModule } from "@angular/router"; +import { getPriorityType } from "@utils/helpers/getPriorityType"; @Component({ selector: "app-kanban-task", templateUrl: "./kanban-task.component.html", styleUrl: "./kanban-task.component.scss", - imports: [CommonModule, IconComponent, AvatarComponent, TagComponent, RouterLink], + imports: [CommonModule, RouterModule, IconComponent, AvatarComponent, TagComponent], standalone: true, }) export class KanbanTaskComponent { @Input({ required: true }) task: any; - private readonly priorityInfoList = priorityInfoList; - private readonly hexToRgba = hexToRgba; - - getPriorityType(priorityId: number, type: "background" | "color", opacity = 0.25) { - const findedPriority = this.priorityInfoList.find( - priority => priority.priorityType === priorityId - ); - const baseColor = findedPriority?.color ?? "var(--light-white)"; - - if (!findedPriority) return; - - if (type === "color") { - return { "background-color": baseColor }; - } - - const rgbaColor = this.hexToRgba(baseColor, opacity); - return { "background-color": rgbaColor }; - } + getPriorityType = getPriorityType; } diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts b/projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts index d500e168..7e065b4e 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts +++ b/projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts @@ -13,7 +13,7 @@ import { ActivatedRoute } from "@angular/router"; import { PartnerProgramFields } from "@office/models/partner-program-fields.model"; import { Project } from "@office/models/project.model"; import { ProjectService } from "@office/services/project.service"; -import { stripNullish } from "@utils/stripNull"; +import { stripNullish } from "@utils/helpers/stripNull"; import { concatMap, filter } from "rxjs"; /** * Сервис для управления основной формой проекта и формой дополнительных полей партнерской программы. diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts b/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts index 15b66153..cc9e17c9 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts +++ b/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts @@ -233,7 +233,6 @@ export class ProjectResourceService { public editResources(projectId: number) { const resources = this.getResourcesData(); - console.log(resources); const requests = resources.map(resource => { const payload: Omit = { diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-vacancy.service.ts b/projects/social_platform/src/app/office/projects/edit/services/project-vacancy.service.ts index 997a65f5..26782b1e 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-vacancy.service.ts +++ b/projects/social_platform/src/app/office/projects/edit/services/project-vacancy.service.ts @@ -7,7 +7,7 @@ import { ValidationService } from "@corelib"; import { Skill } from "@office/models/skill"; import { Vacancy } from "@office/models/vacancy.model"; import { VacancyService } from "@office/services/vacancy.service"; -import { stripNullish } from "@utils/stripNull"; +import { stripNullish } from "@utils/helpers/stripNull"; import { rolesMembersList } from "projects/core/src/consts/lists/roles-members-list.const"; import { ProjectFormService } from "./project-form.service"; import { workExperienceList } from "projects/core/src/consts/lists/work-experience-list.const"; diff --git a/projects/social_platform/src/app/office/projects/list/list.component.ts b/projects/social_platform/src/app/office/projects/list/list.component.ts index 3cba85c1..02987d18 100644 --- a/projects/social_platform/src/app/office/projects/list/list.component.ts +++ b/projects/social_platform/src/app/office/projects/list/list.component.ts @@ -34,7 +34,7 @@ import { ApiPagination } from "@models/api-pagination.model"; import { InfoCardComponent } from "../../features/info-card/info-card.component"; import { IconComponent } from "@ui/components"; import { SubscriptionService } from "@office/services/subscription.service"; -import { inviteToProjectMapper } from "@utils/inviteToProjectMapper"; +import { inviteToProjectMapper } from "@utils/helpers/inviteToProjectMapper"; /** * КОМПОНЕНТ СПИСКА ПРОЕКТОВ diff --git a/projects/social_platform/src/app/office/projects/projects.component.ts b/projects/social_platform/src/app/office/projects/projects.component.ts index 695b5323..d98f3d45 100644 --- a/projects/social_platform/src/app/office/projects/projects.component.ts +++ b/projects/social_platform/src/app/office/projects/projects.component.ts @@ -12,7 +12,7 @@ import { BackComponent } from "@uilib"; import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component"; import { ProjectsFilterComponent } from "./projects-filter/projects-filter.component"; import { Project } from "@office/models/project.model"; -import { inviteToProjectMapper } from "@utils/inviteToProjectMapper"; +import { inviteToProjectMapper } from "@utils/helpers/inviteToProjectMapper"; import { ProjectsService } from "./services/projects.service"; import { InfoCardComponent } from "@office/features/info-card/info-card.component"; diff --git a/projects/social_platform/src/app/office/services/chat.service.ts b/projects/social_platform/src/app/office/services/chat.service.ts index e7d81d30..dee4ed65 100644 --- a/projects/social_platform/src/app/office/services/chat.service.ts +++ b/projects/social_platform/src/app/office/services/chat.service.ts @@ -57,7 +57,7 @@ export class ChatService { const tokens = this.tokenService.getTokens(); if (!tokens) throw new Error("No token provided"); - return this.websocketService.connect(`/chat/?token=${tokens.access}`); + return this.websocketService.connect(`/chat/`); } /** diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html new file mode 100644 index 00000000..95c1b26a --- /dev/null +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html @@ -0,0 +1,61 @@ + + +
+ +
+ + +
    + @for (option of options; track option.id; let index = $index) { +
  • +
    + @if (option.additionalInfo) { @switch (type) { @case('icons') { + + + } @case ('avatars') { + + + } @case ('shapes') { +
    + + } @case ('goals') { + {{ + option.label.length > 20 ? option.label.slice(0, 17) + "..." : option.label + }} + } @case ('tags') { + #{{ + option.label.length > 15 ? option.label.slice(0, 12) + "..." : option.label + }} + } } } +
    + + @if (type !== 'tags' && type !== 'goals') { +

    {{ option.label }}

    + } + + • +
    • + } @if (type === 'tags') { @if (!creatingTag) { +
  • + +
    • + } @else { + + } } +
+ diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss new file mode 100644 index 00000000..61b38c8a --- /dev/null +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss @@ -0,0 +1,74 @@ +.field { + &__options { + width: 100%; + max-height: 200px; + padding: 12px; + overflow-y: auto; + background-color: var(--light-white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + z-index: 1000; + display: flex; + flex-direction: column; + gap: 5px; + align-items: flex-start; + } + + &__option { + display: flex; + align-items: center; + justify-content: space-between; + cursor: pointer; + gap: 5px; + transition: color 0.2s ease-in-out; + + &--add-object { + display: flex; + align-items: center; + justify-content: center; + width: 80px; + padding: 3px; + cursor: pointer; + border: 0.5px solid var(--accent); + border-radius: var(--rounded-xl); + + i { + color: var(--accent); + } + } + + &:hover { + p { + color: var(--accent); + } + } + + &--additional { + display: flex; + align-items: center; + gap: 5px; + + i { + color: var(--accent); + } + + app-tag { + width: 80px; + } + } + + &-priority { + width: 15px; + height: 15px; + border-radius: var(--rounded-xxl); + } + + &--highlighted { + background-color: var(--light-gray); + } + + &--point { + color: var(--accent); + } + } +} diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts new file mode 100644 index 00000000..1e329234 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts @@ -0,0 +1,108 @@ +/** @format */ + +import { ConnectedPosition, OverlayModule } from "@angular/cdk/overlay"; +import { CommonModule } from "@angular/common"; +import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from "@angular/core"; +import { AvatarComponent } from "../avatar/avatar.component"; +import { IconComponent } from "@uilib"; +import { getPriorityType } from "@utils/helpers/getPriorityType"; +import { TagComponent } from "../tag/tag.component"; +import { ClickOutsideModule } from "ng-click-outside"; +import { CreateTagFormComponent } from "@office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component"; + +@Component({ + selector: "app-dropdown", + standalone: true, + imports: [ + CommonModule, + OverlayModule, + AvatarComponent, + IconComponent, + TagComponent, + ClickOutsideModule, + CreateTagFormComponent, + ], + templateUrl: "./dropdown.component.html", + styleUrl: "./dropdown.component.scss", +}) +export class DropdownComponent { + /** Состояние для определения списка элементов */ + @Input() options: { id: number; label: string; value: any; additionalInfo?: any }[] = []; + + @Input() type: "icons" | "avatars" | "shapes" | "tags" | "goals" | "text" = "text"; + + /** Состояние для открытия списка выпадающего */ + @Input() isOpen = false; + + /** Состояние для выделения элемента списка выпадающего */ + @Input() highlightedIndex = -1; + + @Input() colorText: "grey" | "black" | "red" = "grey"; + + /** Событие для выбора элемента */ + @Output() select = new EventEmitter(); + + /** Событие для логики при клике вне списка выпадающего */ + @Output() outside = new EventEmitter(); + + @Output() tagInfo = new EventEmitter<{ name: string; color: string }>(); + + @ViewChild("dropdown", { static: true }) dropdown!: ElementRef; + + /** режим создания тега */ + creatingTag = false; + + getPriorityType = getPriorityType; + + positions: ConnectedPosition[] = [ + { + originX: "start", + originY: "bottom", + overlayX: "start", + overlayY: "top", + offsetY: 4, + }, + { + originX: "start", + originY: "top", + overlayX: "start", + overlayY: "bottom", + offsetY: -4, + }, + ]; + + /** Метод для выбора элемента и emit для родительского компонента */ + onSelect(event: Event, id: number) { + event.stopPropagation(); + this.select.emit(id); + } + + /** Метод для клика вне списка выпадающего */ + onClickOutside() { + this.outside.emit(); + } + + startCreatingTag(event: Event) { + event.stopPropagation(); + this.creatingTag = true; + } + + onConfirmCreateTag(tagInfo: { name: string; color: string }): void { + this.tagInfo.emit(tagInfo); + this.creatingTag = false; + this.isOpen = false; + } + + getTextColor(colorText: "grey" | "black" | "red") { + switch (colorText) { + case "red": + return "color: var(--red)"; + + case "black": + return "color: var(--black)"; + + case "grey": + return "color: var(--grey-for-text)"; + } + } +} diff --git a/projects/social_platform/src/app/ui/components/input/input.component.html b/projects/social_platform/src/app/ui/components/input/input.component.html index 0edc178d..44d83b38 100644 --- a/projects/social_platform/src/app/ui/components/input/input.component.html +++ b/projects/social_platform/src/app/ui/components/input/input.component.html @@ -4,6 +4,7 @@
+ @if (type === 'radio') { + } @else if (type === 'date') { + + } @else {
} +
(); - - /** Событие нажатия Enter */ @Output() enter = new EventEmitter(); - - /** Событие изменения состояния радио (для внешних обработчиков) */ @Output() change = new EventEmitter(); - /** Обработчик для радио */ + /** Обработчик для radвариант io */ onRadioChange(event: Event): void { if (this.type === "radio") { const target = event.target as HTMLInputElement; this.value = target.value; this.onChange(this.value); this.appValueChange.emit(this.value); - this.change.emit(event); // Эмитим событие для внешних обработчиков + this.change.emit(event); + this.onTouch(); + } + } + + /** Обработчик изменения даты в datepicker */ + onDateChange(event: any): void { + if (this.type === "date" && event.value) { + const date = event.value as Date; + // Форматируем дату в нужный формат (например, DD.MM.YY) + const day = String(date.getDate()).padStart(2, "0"); + const month = String(date.getMonth() + 1).padStart(2, "0"); + const year = String(date.getFullYear()).slice(-2); + const formattedDate = `${day}.${month}.${year}`; + + this.value = formattedDate; + this.onChange(formattedDate); + this.appValueChange.emit(formattedDate); this.onTouch(); } } - /** Показать подсказку */ showTooltip(): void { this.isTooltipVisible = true; } - /** Скрыть подсказку */ hideTooltip(): void { this.isTooltipVisible = false; } - /** Обработчик ввода текста */ onInput(event: Event): void { const value = (event.target as HTMLInputElement).value; this.onChange(value); this.appValueChange.emit(value); } - /** Обработчик потери фокуса */ onBlur(): void { this.onTouch(); } - /** Текущее значение поля */ value = ""; - // Методы ControlValueAccessor + // Геттер для преобразования строковой даты в объект Date для datepicker + get dateValue(): Date | null { + if (!this.value || this.type !== "date") return null; + + // Парсим дату из формата DD.MM.YY и преобразуем дату + const parts = this.value.split("."); + if (parts.length === 3) { + const day = parseInt(parts[0], 10); + const month = parseInt(parts[1], 10) - 1; + const year = parseInt(parts[2], 10) + 2000; + return new Date(year, month, day); + } + + return null; + } + writeValue(value: string): void { setTimeout(() => { this.value = value; @@ -170,14 +148,12 @@ export class InputComponent implements ControlValueAccessor { this.onTouch = fn; } - /** Состояние блокировки */ disabled = false; setDisabledState(isDisabled: boolean) { this.disabled = isDisabled; } - /** Обработчик нажатия Enter */ onEnter(event: Event) { event.preventDefault(); this.enter.emit(); diff --git a/projects/social_platform/src/app/ui/components/modal/modal.component.html b/projects/social_platform/src/app/ui/components/modal/modal.component.html index 27a13b45..1e8b0690 100644 --- a/projects/social_platform/src/app/ui/components/modal/modal.component.html +++ b/projects/social_platform/src/app/ui/components/modal/modal.component.html @@ -1,7 +1,7 @@
-
+
- @for (option of options; track option.id; let index = $index) { -
  • - {{ option.label }} - • -
    • - } - - } } + @if (!isDisabled) { + + }
    diff --git a/projects/social_platform/src/app/ui/components/select/select.component.scss b/projects/social_platform/src/app/ui/components/select/select.component.scss index b0e07eaa..55cc1e06 100644 --- a/projects/social_platform/src/app/ui/components/select/select.component.scss +++ b/projects/social_platform/src/app/ui/components/select/select.component.scss @@ -52,44 +52,6 @@ @include typography.body-12; } - &__options { - position: absolute; - right: 0; - bottom: -6px; - left: 5%; - z-index: 11; - width: 90%; - max-height: 200px; - overflow-y: auto; - background-color: var(--white); - border: 0.5px solid var(--gray); - border-radius: var(--rounded-lg); - transform: translateY(100%); - } - - &__option { - display: flex; - align-items: center; - justify-content: space-between; - padding: 12px 18px; - color: var(--dark-grey); - cursor: pointer; - border-radius: var(--rounded-lg); - transition: background-color 0.2s; - - &--highlighted { - background-color: var(--light-gray); - } - - &:hover { - color: var(--accent); - } - - &--point { - color: var(--accent); - } - } - &__arrow { color: var(--dark-grey); transition: all 0.2s; diff --git a/projects/social_platform/src/app/ui/components/select/select.component.ts b/projects/social_platform/src/app/ui/components/select/select.component.ts index 28ad1fdb..c4149264 100644 --- a/projects/social_platform/src/app/ui/components/select/select.component.ts +++ b/projects/social_platform/src/app/ui/components/select/select.component.ts @@ -13,6 +13,7 @@ import { import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms"; import { IconComponent } from "@ui/components"; import { ClickOutsideModule } from "ng-click-outside"; +import { DropdownComponent } from "../dropdown/dropdown.component"; /** * Компонент выпадающего списка для выбора значения из предустановленных опций. @@ -45,7 +46,7 @@ import { ClickOutsideModule } from "ng-click-outside"; }, ], standalone: true, - imports: [ClickOutsideModule, IconComponent, CommonModule], + imports: [ClickOutsideModule, IconComponent, CommonModule, DropdownComponent], }) export class SelectComponent implements ControlValueAccessor { /** Текст подсказки */ @@ -106,7 +107,7 @@ export class SelectComponent implements ControlValueAccessor { } if (event.code === "Enter") { if (i >= 0) { - this.onUpdate(event, this.options[this.highlightedIndex].id); + this.onUpdate(this.options[this.highlightedIndex].id); } } if (event.code === "Escape") { @@ -169,11 +170,8 @@ export class SelectComponent implements ControlValueAccessor { } /** Обработчик выбора опции */ - onUpdate(event: Event, id: number): void { - event.stopPropagation(); - if (this.disabled) { - return; - } + onUpdate(id: number): void { + if (this.disabled) return; this.selectedId = id; this.onChange(this.getValue(id) ?? this.options[0].value); diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.html b/projects/social_platform/src/app/ui/components/tag/tag.component.html index a6eac461..c2bf2f5c 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.html +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.html @@ -1,7 +1,7 @@
    - +

    + +
    + @if (canEdit) { + + } @if (canDelete) { + + } +
    diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.scss b/projects/social_platform/src/app/ui/components/tag/tag.component.scss index 261fbd97..696a5a71 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.scss +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.scss @@ -3,16 +3,19 @@ .tag { display: flex; align-items: center; - align-self: center; justify-content: center; max-width: 300px; padding: 2px 20px; overflow: hidden; color: var(--accent); - text-align: center; text-overflow: ellipsis; white-space: nowrap; border-radius: var(--rounded-xxl); + position: relative; + + p { + margin: 0px 10px; + } &--inline { color: var(--white); @@ -88,10 +91,21 @@ } } - ::ng-deep { - >* { - &:not(:last-child) { - margin-right: 10px; + &__icons { + position: absolute; + top: 30%; + right: 5%; + display: flex; + align-items: center; + flex-shrink: 0; + gap: 3px; + + i { + opacity: 1; + cursor: pointer; + + &:hover { + opacity: 0.7; } } } diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.ts b/projects/social_platform/src/app/ui/components/tag/tag.component.ts index 44cc9d36..a541929b 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.ts +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.ts @@ -1,6 +1,7 @@ /** @format */ -import { Component, Input, OnInit } from "@angular/core"; +import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; +import { IconComponent } from "../icon/icon.component"; /** * Компонент тега для отображения статусов, категорий или меток. @@ -20,6 +21,7 @@ import { Component, Input, OnInit } from "@angular/core"; templateUrl: "./tag.component.html", styleUrl: "./tag.component.scss", standalone: true, + imports: [IconComponent], }) export class TagComponent implements OnInit { constructor() {} @@ -30,5 +32,31 @@ export class TagComponent implements OnInit { /** Стиль отображения */ @Input() appearance: "inline" | "outline" = "inline"; + /** Возможность редактирования */ + @Input() canEdit?: boolean; + + /** Возможность удаления */ + @Input() canDelete?: boolean; + + /** Событие для возможности удаления */ + @Output() delete = new EventEmitter(); + + /** Событие для возможности редактирования */ + @Output() edit = new EventEmitter(); + ngOnInit(): void {} + + /** Метод для вызова удаления элемента */ + onDelete(event: MouseEvent): void { + event.preventDefault(); + event.stopPropagation(); + this.delete.emit(); + } + + /** Метод для вызова редактирования элемента */ + onEdit(event: MouseEvent): void { + event.preventDefault(); + event.stopPropagation(); + this.edit.emit(); + } } diff --git a/projects/social_platform/src/app/utils/days-untit.ts b/projects/social_platform/src/app/utils/days-untit.ts new file mode 100644 index 00000000..2fbe21f0 --- /dev/null +++ b/projects/social_platform/src/app/utils/days-untit.ts @@ -0,0 +1,13 @@ +/** @format */ + +export const daysUntil = (tommorowDate: Date) => { + const todayDate = new Date(); + + const difference = tommorowDate.getTime() - todayDate.getTime(); + + const dayInMs = 1000 * 60 * 60 * 24; + + if (difference <= 0) return 0; + + return Math.ceil(difference / dayInMs); +}; diff --git a/projects/social_platform/src/app/utils/helpers/getPriorityType.ts b/projects/social_platform/src/app/utils/helpers/getPriorityType.ts new file mode 100644 index 00000000..f044facd --- /dev/null +++ b/projects/social_platform/src/app/utils/helpers/getPriorityType.ts @@ -0,0 +1,22 @@ +/** @format */ + +import { priorityInfoList } from "projects/core/src/consts/lists/priority-info-list.const"; +import { hexToRgba } from "./hexToRgba"; + +export const getPriorityType = ( + priorityId: number, + type: "background" | "color", + opacity = 0.25 +) => { + const findedPriority = priorityInfoList.find(priority => priority.priorityType === priorityId); + const baseColor = findedPriority?.color ?? "var(--light-white)"; + + if (!findedPriority) return; + + if (type === "color") { + return { "background-color": baseColor }; + } + + const rgbaColor = hexToRgba(baseColor, opacity); + return { "background-color": rgbaColor }; +}; diff --git a/projects/social_platform/src/app/utils/inviteToProjectMapper.ts b/projects/social_platform/src/app/utils/helpers/inviteToProjectMapper.ts similarity index 100% rename from projects/social_platform/src/app/utils/inviteToProjectMapper.ts rename to projects/social_platform/src/app/utils/helpers/inviteToProjectMapper.ts diff --git a/projects/social_platform/src/app/utils/stripNull.ts b/projects/social_platform/src/app/utils/helpers/stripNull.ts similarity index 100% rename from projects/social_platform/src/app/utils/stripNull.ts rename to projects/social_platform/src/app/utils/helpers/stripNull.ts diff --git a/projects/social_platform/src/app/utils/transformYear.ts b/projects/social_platform/src/app/utils/helpers/transformYear.ts similarity index 100% rename from projects/social_platform/src/app/utils/transformYear.ts rename to projects/social_platform/src/app/utils/helpers/transformYear.ts diff --git a/projects/social_platform/src/app/utils/yearRangeValidators.ts b/projects/social_platform/src/app/utils/helpers/yearRangeValidators.ts similarity index 100% rename from projects/social_platform/src/app/utils/yearRangeValidators.ts rename to projects/social_platform/src/app/utils/helpers/yearRangeValidators.ts From 2e530f816ebe539800af172a34ecf177fd079413 Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 18 Nov 2025 18:50:53 +0300 Subject: [PATCH 08/22] add styles for kanban task-deatail, create-tag-form, dropdown, tag components --- .../context-menu/context-menu.component.scss | 27 +++++++++---------- .../news-card/news-card.component.scss | 4 +-- .../kanban-board/kanban-board.component.scss | 7 +++-- .../create-tag-form.component.scss | 18 ++++++------- .../task/detail/task-detail.component.scss | 20 +++++++------- .../dropdown/dropdown.component.scss | 16 +++++------ .../app/ui/components/tag/tag.component.scss | 8 +++--- 7 files changed, 48 insertions(+), 52 deletions(-) diff --git a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss index b9c0093d..ed9cf86b 100644 --- a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss +++ b/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss @@ -3,42 +3,39 @@ .context-menu { position: fixed; z-index: 9999; - - background-color: white; - border-radius: 8px; - box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12); - padding: 8px 0; margin: 0; list-style: none; - - transition: opacity 0.15s ease; + background-color: white; + border-radius: 8px; outline: none; + box-shadow: 0 4px 16px rgb(0 0 0 / 12%); + transition: opacity 0.15s ease; &__item { padding: 10px 16px; - cursor: pointer; white-space: nowrap; + cursor: pointer; user-select: none; transition: background-color 0.15s ease; &:hover { - background-color: rgba(0, 0, 0, 0.04); + background-color: rgb(0 0 0 / 4%); } &:active { - background-color: rgba(0, 0, 0, 0.08); + background-color: rgb(0 0 0 / 8%); } &--red { color: #f44336; &:hover { - background-color: rgba(244, 67, 54, 0.08); + background-color: rgb(244 67 54 / 8%); } &:active { - background-color: rgba(244, 67, 54, 0.16); + background-color: rgb(244 67 54 / 16%); } } @@ -47,15 +44,15 @@ } &--disabled { - opacity: 0.5; - cursor: not-allowed; pointer-events: none; + cursor: not-allowed; + opacity: 0.5; } } &__divider { height: 1px; margin: 8px 0; - background-color: rgba(0, 0, 0, 0.08); + background-color: rgb(0 0 0 / 8%); } } diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss index f49fdc35..aac5e69e 100644 --- a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss +++ b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss @@ -40,11 +40,11 @@ } &__option { + width: 120px; padding: 5px 20px; + color: var(--grey-for-text); cursor: pointer; - width: 120px; transition: background-color 0.2s; - color: var(--grey-for-text); &:hover { color: var(--accent); diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index e5cfe76f..004a489c 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -1,5 +1,3 @@ - - .kanban { &__wrapper { position: relative; @@ -33,8 +31,8 @@ border-radius: var(--rounded-xl); &--empty { - cursor: pointer; justify-content: center; + cursor: pointer; } } @@ -46,7 +44,8 @@ margin-top: 20px; } - i, p { + i, + p { color: var(--accent); cursor: pointer; } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss index d72879c1..4e580055 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss @@ -1,16 +1,16 @@ .create-tag { &__form { display: flex; - align-items: center; gap: 5px; + align-items: center; } &__pick-color { - border-radius: var(--rounded-sm); - height: 9px; - width: 9px; position: relative; + width: 9px; + height: 9px; cursor: pointer; + border-radius: var(--rounded-sm); } &__input { @@ -29,17 +29,17 @@ &__colors { position: absolute; - bottom: -25%; right: -12%; + bottom: -25%; padding: 7px; background-color: var(--light-white); - border-radius: var(--rounded-md); border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-md); &-wrapper { display: grid; - grid-template-columns: repeat(4, 1fr); grid-template-rows: repeat(2, 1fr); + grid-template-columns: repeat(4, 1fr); gap: 3px; } } @@ -48,13 +48,13 @@ .field { &__option { display: flex; + gap: 5px; align-items: center; justify-content: space-between; cursor: pointer; - gap: 5px; transition: color 0.2s ease-in-out; - &--add-object { + &--add-object { display: flex; align-items: center; justify-content: center; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index 0acc66ae..5e513e0d 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -1,7 +1,7 @@ @use "styles/typography"; .kanban { - &__detail { + &__detail { position: absolute; top: 0%; right: 0%; @@ -25,7 +25,9 @@ } } - &-type, &-priority-wrapper, &-delete-wrapper { + &-type, + &-priority-wrapper, + &-delete-wrapper { cursor: pointer; } @@ -34,7 +36,6 @@ height: 15px; background-color: var(--green); border-radius: var(--rounded-xxl); - } &-general { @@ -65,18 +66,17 @@ ::ng-deep { app-input { - .field { width: 44px !important; height: 23px !important; } .field__input { - border: 0; + max-width: 44px; + padding: 0; background: transparent; + border: 0; border-radius: 0; - padding: 0; - max-width: 44px; &:focus { border-color: 0; @@ -136,8 +136,8 @@ position: absolute; top: 50%; left: 50%; - transform: translate(-50%, -50%); color: var(--light-white) !important; + transform: translate(-50%, -50%); } } @@ -173,7 +173,7 @@ } &-description { - margin: 12px 0px; + margin: 12px 0; ::ng-deep { app-textarea { @@ -338,7 +338,7 @@ color: var(--accent); cursor: pointer; background-color: var(--accent); - border-radius: var(--rounded-sm) + border-radius: var(--rounded-sm); } &__input { diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss index 61b38c8a..5f95868d 100644 --- a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.scss @@ -1,5 +1,10 @@ .field { &__options { + z-index: 1000; + display: flex; + flex-direction: column; + gap: 5px; + align-items: flex-start; width: 100%; max-height: 200px; padding: 12px; @@ -7,22 +12,17 @@ background-color: var(--light-white); border: 0.5px solid var(--medium-grey-for-outline); border-radius: var(--rounded-lg); - z-index: 1000; - display: flex; - flex-direction: column; - gap: 5px; - align-items: flex-start; } &__option { display: flex; + gap: 5px; align-items: center; justify-content: space-between; cursor: pointer; - gap: 5px; transition: color 0.2s ease-in-out; - &--add-object { + &--add-object { display: flex; align-items: center; justify-content: center; @@ -45,8 +45,8 @@ &--additional { display: flex; - align-items: center; gap: 5px; + align-items: center; i { color: var(--accent); diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.scss b/projects/social_platform/src/app/ui/components/tag/tag.component.scss index 696a5a71..e97773ac 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.scss +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.scss @@ -1,6 +1,7 @@ /** @format */ .tag { + position: relative; display: flex; align-items: center; justify-content: center; @@ -11,10 +12,9 @@ text-overflow: ellipsis; white-space: nowrap; border-radius: var(--rounded-xxl); - position: relative; p { - margin: 0px 10px; + margin: 0 10px; } &--inline { @@ -96,13 +96,13 @@ top: 30%; right: 5%; display: flex; - align-items: center; flex-shrink: 0; gap: 3px; + align-items: center; i { - opacity: 1; cursor: pointer; + opacity: 1; &:hover { opacity: 0.7; From 21dd8eb80679c3d2f8c7c4fa91752e4af3968ce0 Mon Sep 17 00:00:00 2001 From: Awakich Date: Fri, 21 Nov 2025 18:23:46 +0300 Subject: [PATCH 09/22] add creating/updating tagsLib, adding/editing skills, tags, goals, mapper for tag colors --- ...nst.ts => direction-project-list.const.ts} | 0 .../consts/lists/priority-info-list.const.ts | 24 +- .../src/consts/lists/tag-colots.list.const.ts | 8 + .../consts/other/kanban-column-info.const.ts | 14 + .../kanban-board/kanban-board.component.html | 16 +- .../kanban-board/kanban-board.component.ts | 41 +++ .../kanban-board/models/column.model.ts | 2 + .../create-tag-form.component.html | 2 +- .../create-tag-form.component.ts | 86 +++++- .../sidebar/kanban-board-sidebar.component.ts | 2 +- .../task/detail/task-detail.component.html | 250 +++++++++------- .../task/detail/task-detail.component.scss | 44 +++ .../task/detail/task-detail.component.ts | 269 ++++++++++++++---- .../project-main-step.component.ts | 2 +- .../skills-group/skills-group.component.scss | 4 + .../dropdown/dropdown.component.html | 8 +- .../components/dropdown/dropdown.component.ts | 28 +- .../ui/components/modal/modal.component.html | 2 +- .../app/ui/components/tag/tag.component.html | 6 + .../app/ui/components/tag/tag.component.scss | 60 +++- .../app/ui/components/tag/tag.component.ts | 51 +++- .../src/app/utils/helpers/getActionType.ts | 11 + 22 files changed, 712 insertions(+), 218 deletions(-) rename projects/core/src/consts/lists/{ldirection-project-list.const.ts => direction-project-list.const.ts} (100%) create mode 100644 projects/core/src/consts/other/kanban-column-info.const.ts create mode 100644 projects/social_platform/src/app/utils/helpers/getActionType.ts diff --git a/projects/core/src/consts/lists/ldirection-project-list.const.ts b/projects/core/src/consts/lists/direction-project-list.const.ts similarity index 100% rename from projects/core/src/consts/lists/ldirection-project-list.const.ts rename to projects/core/src/consts/lists/direction-project-list.const.ts diff --git a/projects/core/src/consts/lists/priority-info-list.const.ts b/projects/core/src/consts/lists/priority-info-list.const.ts index 688e69a0..e1fd7a15 100644 --- a/projects/core/src/consts/lists/priority-info-list.const.ts +++ b/projects/core/src/consts/lists/priority-info-list.const.ts @@ -9,39 +9,39 @@ export const priorityInfoList = [ { - id: 0, + id: 1, label: "бэклог", color: "#322299", - priorityType: 0, + priorityType: 1, }, { - id: 1, + id: 2, label: "в ближайшие часы", color: "#A63838", - priorityType: 1, + priorityType: 2, }, { - id: 2, + id: 3, label: "высокий", color: "#D48A9E", - priorityType: 2, + priorityType: 3, }, { - id: 3, + id: 4, label: "средний", color: "#E5B25D", - priorityType: 3, + priorityType: 4, }, { - id: 4, + id: 5, label: "низкий", color: "#297373", - priorityType: 4, + priorityType: 5, }, { - id: 5, + id: 6, label: "улучшение", color: "#88C9A1", - priorityType: 5, + priorityType: 6, }, ]; diff --git a/projects/core/src/consts/lists/tag-colots.list.const.ts b/projects/core/src/consts/lists/tag-colots.list.const.ts index 4a8d1e21..c436a245 100644 --- a/projects/core/src/consts/lists/tag-colots.list.const.ts +++ b/projects/core/src/consts/lists/tag-colots.list.const.ts @@ -3,34 +3,42 @@ export const tagColorsList = [ { id: 1, + name: "accent", color: "#8A63E6", }, { id: 2, + name: "accent-medium", color: "#9764BA", }, { id: 3, + name: "blue-dark", color: "#2F36AA", }, { id: 4, + name: "cyan", color: "#4CD9F1", }, { id: 5, + name: "complete", color: "#88C9A1", }, { id: 6, + name: "red", color: "#D48A9E", }, { id: 7, + name: "gold", color: "#E5B25D", }, { id: 8, + name: "green-dark", color: "#297373", }, ]; diff --git a/projects/core/src/consts/other/kanban-column-info.const.ts b/projects/core/src/consts/other/kanban-column-info.const.ts new file mode 100644 index 00000000..592ddec3 --- /dev/null +++ b/projects/core/src/consts/other/kanban-column-info.const.ts @@ -0,0 +1,14 @@ +/** @format */ + +export const kanbanColumnInfo = [ + { + id: 1, + label: "редактировать", + value: "edit", + }, + { + id: 2, + label: "удалить", + value: "delete", + }, +]; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html index c2291a1e..02aa8a6a 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html @@ -19,7 +19,21 @@ }

    {{ boardColumn.name }}

    - + +
    + + + @if (isColumnInfoOpen && (selectedColumnId === boardColumn.order)) { + + } +
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts index 5b924209..0e4f7ee1 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -11,6 +11,8 @@ import { IconComponent } from "@ui/components"; import { KanbanTaskComponent } from "./shared/task/kanban-task.component"; import { ClickOutsideModule } from "ng-click-outside"; import { TaskDetailComponent } from "./shared/task/detail/task-detail.component"; +import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; +import { kanbanColumnInfo } from "projects/core/src/consts/other/kanban-column-info.const"; @Component({ selector: "app-kanban-board", @@ -23,6 +25,7 @@ import { TaskDetailComponent } from "./shared/task/detail/task-detail.component" KanbanTaskComponent, ClickOutsideModule, TaskDetailComponent, + DropdownComponent, ], standalone: true, }) @@ -36,6 +39,13 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { boardColumns = signal([]); isTaskDetailOpen = signal(false); + isColumnInfoOpen = false; + selectedColumnId = 0; + + get columnInfoOptions() { + return kanbanColumnInfo; + } + ngOnInit(): void { const detailInfoUrl$ = this.route.queryParams.subscribe({ next: params => { @@ -61,6 +71,7 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { { id: 0, name: "бэклог", + order: 0, locked: true, tasks: [ { @@ -76,6 +87,7 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { { id: 1, locked: false, + order: 1, name: "в работе", tasks: [ { id: 3, title: "настроить API" }, @@ -85,6 +97,7 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { { id: 2, locked: false, + order: 2, name: "Готово", tasks: [ { id: 5, title: "верстка страницы входа" }, @@ -100,6 +113,34 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.subscriptions.forEach($ => $.unsubscribe()); } + toggleDropDown(columnId: number): void { + if (this.selectedColumnId === columnId) { + this.isColumnInfoOpen = !this.isColumnInfoOpen; + } else { + this.selectedColumnId = columnId; + this.isColumnInfoOpen = true; + } + } + + onTypeSelect(option: any, state: boolean, columnId?: number): void { + if (!option) { + this.isColumnInfoOpen = state; + return; + } + + switch (option) { + case 1: + console.log("EDIT in column:", columnId); + break; + + case 2: + console.log("DELETE in column:", columnId); + break; + } + + this.isColumnInfoOpen = state; + } + openDetailTask(taskId: number): void { this.router.navigate([], { queryParams: { diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts index a97ace85..240cac32 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts @@ -5,4 +5,6 @@ import { TaskPreview } from "./task.model"; export interface Column { id: number; tasks: TaskPreview[]; + order: number; + // TODO: добавить даты создания и удаления } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html index a1358ec0..b2c15dc5 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html @@ -21,7 +21,7 @@ @for (colorItem of tagColors; track $index) {
    } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts index 9409a5a8..43ddb6b1 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts @@ -1,9 +1,30 @@ /** @format */ import { CommonModule } from "@angular/common"; -import { Component, EventEmitter, inject, Output } from "@angular/core"; +import { + Component, + EventEmitter, + inject, + Input, + OnChanges, + OnInit, + Output, + SimpleChanges, +} from "@angular/core"; import { tagColorsList } from "projects/core/src/consts/lists/tag-colots.list.const"; -import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from "@angular/forms"; +import { + FormBuilder, + FormGroup, + FormsModule, + ReactiveFormsModule, + Validators, +} from "@angular/forms"; + +export interface TagData { + id?: number; + name: string; + color: string; +} @Component({ selector: "app-create-tag-form", @@ -12,15 +33,17 @@ import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from "@angul imports: [CommonModule, FormsModule, ReactiveFormsModule], standalone: true, }) -export class CreateTagFormComponent { - @Output() createTag = new EventEmitter<{ name: string; color: string }>(); +export class CreateTagFormComponent implements OnInit, OnChanges { + @Input() editingTag: TagData | null = null; + @Output() createTag = new EventEmitter(); + @Output() updateTag = new EventEmitter(); private readonly fb = inject(FormBuilder); constructor() { this.tagForm = this.fb.group({ - tagName: [""], - tagColor: [tagColorsList[0].color], + tagName: ["", [Validators.required, Validators.maxLength(30)]], + tagColor: [tagColorsList[0].name, [Validators.required]], }); } @@ -32,11 +55,27 @@ export class CreateTagFormComponent { } get selectedColor(): string { - return this.tagForm.get("tagColor")?.value || tagColorsList[0].color; + const colorName = this.tagForm.get("tagColor")?.value; + const found = tagColorsList.find(c => c.name === colorName); + return found ? found.color : tagColorsList[0].color; + } + + get isEditMode(): boolean { + return !!this.editingTag; + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes["editingTag"]) { + this.initFormFromEditingTag(); + } + } + + ngOnInit(): void { + this.initFormFromEditingTag(); } - selectTagColor(color: string) { - this.tagForm.patchValue({ tagColor: color }); + selectTagColor(colorName: string) { + this.tagForm.patchValue({ tagColor: colorName }); this.openPickColors = false; } @@ -45,17 +84,36 @@ export class CreateTagFormComponent { event.preventDefault(); const { tagName, tagColor } = this.tagForm.value; + const tagData: TagData = { + name: tagName, + color: tagColor, + }; if (!tagName?.trim() || !tagColor) return; - this.createTag.emit({ - name: tagName, - color: tagColor, - }); + if (this.isEditMode && this.editingTag?.id) { + this.updateTag.emit({ ...tagData, id: this.editingTag.id }); + } else { + this.createTag.emit(tagData); + } + this.resetForm(); + } + private resetForm(): void { this.tagForm.reset({ tagName: "", - tagColor: tagColorsList[0].color, + tagColor: tagColorsList[0].name, }); } + + private initFormFromEditingTag() { + if (this.editingTag) { + this.tagForm.patchValue({ + tagName: this.editingTag.name, + tagColor: this.editingTag.color, + }); + } else { + this.resetForm(); + } + } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts index 8323cf32..4ffd7a86 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts @@ -1,7 +1,7 @@ /** @format */ import { CommonModule } from "@angular/common"; -import { ChangeDetectorRef, Component, inject, Input, signal } from "@angular/core"; +import { Component, Input, signal } from "@angular/core"; import { Project } from "@office/models/project.model"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { KanbanBoardActionsComponent } from "../actions/kanban-board-actions.component"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html index e1d6829a..7139513a 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html @@ -4,50 +4,53 @@
    прикрепить результат
    + @if (taskDetailForm.get("action"); as action) {
    - +
    - + } @if (taskDetailForm.get("priority"); as priority) {
    -
    +
    + }
    @@ -57,8 +60,12 @@
    @if (taskDetailForm.get("title")?.value; as title) {

    {{ title }}

    + } @if (taskDetailForm.get("score")?.value; as score) { +
    + +

    {{ score }}

    +
    } -
    @@ -100,7 +107,7 @@
    ответственный
    appIcon icon="edit-pen" appSquare="8" - (click)="toggleDropdown('responsible', !isResponsiblePickOpen)" + (click)="onTypeSelect('responsible', !isResponsiblePickOpen)" > } @@ -108,24 +115,24 @@
    ответственный
    [isOpen]="isResponsiblePickOpen" type="avatars" [options]="responsiblePickOpenOptions" - (select)="onTypeSelect($event, 'responsible')" + (select)="onTypeSelect('responsible', false, $event)" (outside)="isResponsiblePickOpen = false" >
    -

    {{ responsible.value.name }}

    +

    {{ responsible.value.name }}

    } @else {
    @@ -140,24 +147,24 @@
    исполнители
    - @if (performers.value.length >= 0 && performers.value.length <= 3) { + @if (performers.value && performers.value.length >= 0 && performers.value.length <= 7) {
    @for (performer of performers.value; track $index) { }
    - } @if (!(performers.value.length === 3)) { + } @if (!(performers.value && performers.value.length === 7)) {
    @@ -241,26 +248,29 @@
    исполнители
    @if (tags.value.length > 0) {
    - @for (tag of tags.value; track $index) { + @for (tag of tags.value; track tag.id) { {{ "#" + tag.name }}{{ "#" + tag.title }} }
    - } @else { -
    + } @if (tags.value.length < 3) { +
    @@ -278,21 +288,48 @@
    исполнители
    color="soft" [canDelete]="true" (delete)="onDeleteTaskGoal()" - (click)="isGoalPickOpen = !isGoalPickOpen" + (click)=" + $event.stopPropagation(); + showChangeGoalModal = true; + onTypeSelect('goal', !isGoalPickOpen) + " >{{ - goal.value.name.length > 20 ? goal.value.name.slice(0, 15) + "..." : goal.value.name + goal.value.title.length > 20 ? goal.value.title.slice(0, 15) + "..." : goal.value.title }} + + +
    +

    вы хотите изменить цель задачи?

    + +
    + отмена + изменить +
    +
    +     + } @else { -
    +
    }
    @@ -305,51 +342,55 @@
    исполнители
    @if (skills.value.length > 0) {
    - @for (skill of skills.value; track $index) { - {{ - skill.name - }} + @for (skill of skills.value; track skill.id) { + {{ skill.name.length > 20 ? skill.name.slice(0, 17) + "..." : skill.name }} }
    - } @else { + } @if (skills.value.length < 3) {
    - - -
    -

    библиотека навыков

    -
    -
    -
      - @for (skillsGroup of nestedSkills$ | async; track skillsGroup.id) { -
    • - -
      • - } -
    -
    -
    - cохранить -
    -
    }
    }
    + +
    +

    библиотека навыков

    +
    +
    +
      + @for (skillsGroup of nestedSkills$ | async; track skillsGroup.id) { +
    • + +
      • + } +
    +
    +
    + cохранить +
    +     +
    divider image
    @@ -357,7 +398,7 @@
    исполнители
    @if (taskDetailForm.get("description"); as description) {
    - @if (isChangeDescriptionText() && description.value) { + @if (isChangeDescriptionText()) {

    @if (descriptionExpandable) {
    исполнители
    } } @else { исполнители }
    - @if (taskDetailForm.get("files"); as files) { @if (files.value.length >= 0 && files.value.length - <= 3) { @for (file of files.value; track $index) { + @if (taskDetailForm.get("files")?.value; as files) { @if (files.length > 0) { @for (file of + files; track $index) { - } @if (!(files.value.length === 3)) { + } } @if (files.length < 3) {

    файл

    - } } } + } }
    -
    - -
    +
    - +
    -
    @for (f of filesList; track f.id) { @@ -439,10 +481,10 @@
    исполнители
    [size]="f.tempFile.size" [loading]="f.loading" [error]="f.error" + (delete)="onDeleteFile(f.id)" > } -
    -
    +
    -->
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index 5e513e0d..ed92bcce 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -46,6 +46,12 @@ margin-bottom: 5px; border-bottom: 0.5px solid var(--accent); + &-score { + display: flex; + align-items: center; + gap: 3px; + } + p { color: var(--accent) !important; } @@ -119,6 +125,10 @@ display: flex; flex-direction: column; gap: 5px; + + app-tag { + cursor: pointer; + } } &-add-responsible { @@ -383,6 +393,15 @@ flex-direction: column; gap: 20px; padding: 14px; + + @for $i from 1 through 8 { + > li:nth-child(#{$i}) { + ::ng-deep app-skills-group .content--open { + top: 0px; + margin-top: -#{($i - 1) * 50}px; + } + } + } } li { @@ -393,3 +412,28 @@ } } } + +.cancel { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + max-height: calc(100vh - 40px); + padding: 30px 60px; + overflow-y: auto; + + &__title { + text-align: center; + } + + &__buttons { + display: flex; + gap: 10px; + align-items: center; + margin-top: 20px; + } + + &__button { + margin-top: 20px; + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts index 8448506c..3dc72113 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts @@ -5,7 +5,6 @@ import { AfterViewInit, ChangeDetectorRef, Component, - computed, ElementRef, inject, Input, @@ -38,6 +37,11 @@ import { Subscription } from "rxjs"; import { TaskDetail } from "../../../models/task.model"; import { daysUntil } from "@utils/days-untit"; import { KanbanBoardService } from "../../../kanban-board.service"; +import { getPriorityType } from "@utils/helpers/getPriorityType"; +import { getActionType } from "@utils/helpers/getActionType"; +import { ActivatedRoute } from "@angular/router"; +import { TagData } from "../../create-tag-form/create-tag-form.component"; +import { FileService } from "@core/services/file.service"; @Component({ selector: "app-task-detail", @@ -73,24 +77,29 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { @ViewChild("descEl") descEl?: ElementRef; - private readonly kanbanBoardService = inject(KanbanBoardService); private readonly skillsService = inject(SkillsService); + private readonly kanbanBoardService = inject(KanbanBoardService); + private readonly fileService = inject(FileService); + private readonly route = inject(ActivatedRoute); private readonly cdRef = inject(ChangeDetectorRef); constructor(private readonly fb: FormBuilder) { this.taskDetailForm = this.fb.group({ title: ["", Validators.required], responsible: [], - performers: this.fb.array([]), + performers: [], startDate: [null], deadline: [null], - tags: this.fb.array([]), + tags: [[]], goal: [null], - skills: this.fb.array([]), + skills: [[]], description: [null], - files: this.fb.array([]), + files: [[]], priority: [null], + status: [null], action: [null], + score: [null], + tagsLib: [[]], }); } @@ -98,6 +107,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { remainingDaysDeadline = signal(0); + editingTag: TagData | null = null; + /** Уникальный ID для элемента input */ controlId = nanoid(3); @@ -112,18 +123,26 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { isGoalPickOpen = false; isTagsPickOpen = false; + creatingTag = false; + loadingFile = false; + showEditAvatarIcon = false; showEditDeadlineDatePicker = false; showEditStartDatePicker = false; + showChangeGoalModal = false; skillsGroupsModalOpen = signal(false); nestedSkills$ = this.skillsService.getSkillsNested(); openGroupIds = new Set(); + openGroupIndex: number | null = null; filesList: any[] = []; taskDetailForm: FormGroup; + getPriorityType = getPriorityType; + getActionType = getActionType; + subscriptions: Subscription[] = []; get actionTypeOptions() { @@ -154,8 +173,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { get goalPickOptions() { return this.goals - ? this.goals.map((goal, index) => ({ - id: index, + ? this.goals.map(goal => ({ + id: goal.id, label: goal.title, value: goal.id, additionalInfo: goal.title, @@ -164,20 +183,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { } get tagsPickOptions() { - return [ - { - id: 1, - label: "аналитика", - value: "аналитика", - additionalInfo: "primary", - }, - { - id: 2, - label: "продажи", - value: "продажи", - additionalInfo: "complete", - }, - ]; + const tagsLib = this.taskDetailForm.get("tagsLib")?.value || []; + return [...tagsLib]; } get priorityDeleteOptions() { @@ -191,7 +198,11 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { } get hasOpenSkillsGroups(): boolean { - return this.openGroupIds.size > 0; + return this.openGroupIndex !== null; + } + + get selectedSkills(): Skill[] { + return this.taskDetailForm.getRawValue().skills || []; } get statusOfTask() { @@ -216,7 +227,13 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { }; } - ngOnInit(): void {} + ngOnInit(): void { + this.taskDetailForm.valueChanges.subscribe({ + next: value => { + console.log(value); + }, + }); + } /** * Проверка возможности расширения описания после инициализации представления @@ -230,44 +247,169 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { this.checkDescriptionHeigth(); } - onDeleteTaskGoal(): void {} + onDeleteTaskGoal(): void { + this.taskDetailForm.patchValue({ goal: null }); + this.isGoalPickOpen = false; + } + + onDeleteTaskTag(tagId: number): void { + const tags = this.taskDetailForm.get("tags")?.value || []; + + const remainingTags = tags.filter((tag: any) => tag.id !== tagId); + this.taskDetailForm.patchValue({ tags: remainingTags }); + + this.isTagsPickOpen = false; + } - onDeleteTaskTag(): void {} + onEditTaskTag(tagId: number): void { + this.isTagsPickOpen = !this.isTagsPickOpen; + this.creatingTag = true; - onEditTaskTag(): void {} + const tags = this.taskDetailForm.get("tags")?.value || []; + const tag = tags.find((t: any) => t.id === tagId); - getCreatedTagInfo(createdTagInfo: { name: string; color: string }): void { - console.log(createdTagInfo); + if (tag) { + this.editingTag = { + id: tag.id, + name: tag.title, + color: tag.color, + }; + } } - toggleDropdown( + onUpdateTag({ id, name, color }: TagData): void { + const tagsLib = [...(this.taskDetailForm.get("tagsLib")?.value || [])]; + const libIndex = tagsLib.findIndex((t: any) => t.id === id); + + if (libIndex !== -1) { + tagsLib[libIndex] = { + ...tagsLib[libIndex], + label: name, + value: name, + additionalInfo: color, + }; + + this.taskDetailForm.patchValue({ tagsLib: [...tagsLib] }); + } + + const tags = [...(this.taskDetailForm.get("tags")?.value || [])]; + const tagIndex = tags.findIndex((t: any) => t.id === id); + + if (tagIndex !== -1) { + tags[tagIndex] = { + ...tags[tagIndex], + title: name, + color, + }; + this.taskDetailForm.patchValue({ tags: [...tags] }); + } + + this.editingTag = null; + this.creatingTag = false; + } + + createTag({ name, color }: { name: string; color: string }): void { + const { tagsLib } = this.taskDetailForm.value; + const tagInfo = { id: tagsLib.length + 1, label: name, value: name, additionalInfo: color }; + tagsLib.push(tagInfo); + } + + onTypeSelect( type: "action" | "priority" | "responsible" | "performers" | "goal" | "tags" | "delete", - state: boolean + state: boolean, + typeId?: number ) { switch (type) { case "action": this.isActionTypeOpen = state; + this.taskDetailForm.patchValue({ action: typeId }); break; case "priority": this.isPriorityTypeOpen = state; + this.taskDetailForm.patchValue({ priority: typeId }); break; - case "responsible": + case "responsible": { this.isResponsiblePickOpen = state; + + if (typeId !== undefined) { + if (!this.collaborators) return; + + const responsible = this.collaborators.find( + collaborator => collaborator.userId === typeId + ); + this.taskDetailForm.patchValue({ + responsible: { + id: responsible?.userId, + avatar: responsible?.avatar, + name: responsible?.firstName + " " + responsible?.lastName[0], + }, + }); + } break; + } - case "performers": + case "performers": { this.isPerformersPickOpen = state; + + if (typeId !== undefined) { + if (!this.collaborators) return; + + const collaborator = this.collaborators.find( + collaborator => collaborator.userId === typeId + ); + const currentPerformers = this.taskDetailForm.get("performers")?.value || []; + const payload = { + id: collaborator?.userId, + avatar: collaborator?.avatar, + name: collaborator?.firstName + " " + collaborator?.lastName[0], + }; + + if (currentPerformers.some((performer: any) => performer.id === payload.id)) return; + + this.taskDetailForm.patchValue({ + performers: [...currentPerformers, payload], + }); + } break; + } - case "goal": + case "goal": { this.isGoalPickOpen = state; + + if (typeId !== undefined) { + if (!this.goals) return; + + const goal = this.goals.find(goal => goal.id === typeId); + if (goal) this.taskDetailForm.patchValue({ goal: { id: goal.id, title: goal.title } }); + } + break; + } - case "tags": + case "tags": { this.isTagsPickOpen = state; + + if (!state) { + this.editingTag = null; + this.creatingTag = false; + } + + if (typeId !== undefined) { + const tag = this.tagsPickOptions.find((tag: any) => tag.id === typeId); + const payload = { id: tag?.id, title: tag?.label, color: tag?.additionalInfo }; + + const currentTags = this.taskDetailForm.get("tags")?.value || []; + if (currentTags.some((tag: any) => tag.id === payload.id)) return; + this.taskDetailForm.patchValue({ tags: [...currentTags, payload] }); + } else { + this.editingTag = null; + this.creatingTag = false; + } + break; + } case "delete": this.isDeleteTypeOpen = state; @@ -278,17 +420,9 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { } } - onTypeSelect( - typeId: number, - type: "action" | "priority" | "responsible" | "performers" | "goal" | "tags" | "delete" - ): void { - this.toggleDropdown(type, false); - console.log(typeId); - } - onChangeText(event: MouseEvent): void { event.stopPropagation(); - this.isChangeDescriptionText.set(!this.isChangeDescriptionText()); + this.isChangeDescriptionText.set(false); setTimeout(() => this.checkDescriptionHeigth(), 0); } @@ -306,21 +440,29 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { /** Обработчик загрузки файла */ onUpdate(event: Event): void { - const files = (event.currentTarget as HTMLInputElement).files; - if (!files?.length) { + const input = event.currentTarget as HTMLInputElement; + const file = input.files?.[0]; + if (!file) { return; } - console.log("123"); + this.loadingFile = true; + + this.fileService.uploadFile(file).subscribe(url => { + const currentFiles = this.taskDetailForm.get("files")?.value || []; - // this.loading = true; + const newFile = { + name: file.name.split, + link: url, + extension: file.type, + size: file.size, + }; - // this.fileService.uploadFile(files[0]).subscribe(res => { - // this.loading = false; + this.taskDetailForm.get("files")?.setValue([...currentFiles, newFile]); + input.value = ""; - // this.value = res.url; - // this.onChange(res.url); - // }); + this.loadingFile = false; + }); } /** @@ -334,19 +476,21 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { if (isPresent) { this.onRemoveSkill(toggledSkill); } else { - this.onAddSkill(toggledSkill); + if (skills.length < 3) { + this.onAddSkill(toggledSkill); + } } } onGroupToggled(isOpen: boolean, skillsGroupId: number): void { - this.openGroupIds.clear(); - if (isOpen) { - this.openGroupIds.add(skillsGroupId); - } - + this.openGroupIndex = isOpen ? skillsGroupId : null; this.cdRef.markForCheck(); } + isGroupDisabled(skillsGroupId: number): boolean { + return this.openGroupIndex !== null && this.openGroupIndex !== skillsGroupId; + } + /** * Переключение модального окна групп навыков */ @@ -365,6 +509,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { if (isPresent) return; this.taskDetailForm.patchValue({ skills: [newSkill, ...skills] }); + this.cdRef.markForCheck(); } /** @@ -377,6 +522,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { this.taskDetailForm.patchValue({ skills: skills.filter(skill => skill.id !== oddSkill.id), }); + this.cdRef.markForCheck(); } private checkDescriptionHeigth(): void { @@ -387,10 +533,11 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { } private initializeTaskDetailInfo(todayDate: Date, tommorowDate: Date): void { - const taskDetailInfo$ = this.kanbanBoardService.getTaskById(123).subscribe({ + const taskId = this.route.snapshot.queryParams["taskId"]; + const taskDetailInfo$ = this.kanbanBoardService.getTaskById(taskId).subscribe({ next: (taskDetailInfo: TaskDetail) => { this.taskDetailForm.patchValue({ - title: taskDetailInfo.title ?? "Настроить процессы", + title: taskDetailInfo.title ?? "", responsible: taskDetailInfo.responsible ?? null, performers: taskDetailInfo.performers ?? [], startDate: taskDetailInfo.dateTaskStart ?? todayDate, diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts b/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts index 72ae92bd..90f9f3e7 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts +++ b/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts @@ -20,7 +20,7 @@ import { } from "@angular/forms"; import { AuthService } from "@auth/services"; import { ErrorMessage } from "@error/models/error-message"; -import { directionProjectList } from "projects/core/src/consts/lists/ldirection-project-list.const"; +import { directionProjectList } from "projects/core/src/consts/lists/direction-project-list.const"; import { trackProjectList } from "projects/core/src/consts/lists/track-project-list.const"; import { Observable, Subscription } from "rxjs"; import { AvatarControlComponent } from "@ui/components/avatar-control/avatar-control.component"; diff --git a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss b/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss index e7031401..c6ac5f6f 100644 --- a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss +++ b/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss @@ -13,6 +13,7 @@ height: 32px; cursor: pointer; transition: opacity 0.2s ease; + position: relative; i { transition: transform 0.2s ease; @@ -57,6 +58,9 @@ &--open { width: 40%; + position: absolute; + top: 0%; + right: 0%; } &__option { diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html index 95c1b26a..fe0bf3ab 100644 --- a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.html @@ -1,6 +1,6 @@ -
    +
    @@ -55,7 +55,11 @@ } @else { - + } } diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts index 1e329234..166651e4 100644 --- a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts @@ -8,7 +8,10 @@ import { IconComponent } from "@uilib"; import { getPriorityType } from "@utils/helpers/getPriorityType"; import { TagComponent } from "../tag/tag.component"; import { ClickOutsideModule } from "ng-click-outside"; -import { CreateTagFormComponent } from "@office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component"; +import { + CreateTagFormComponent, + TagData, +} from "@office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component"; @Component({ selector: "app-dropdown", @@ -34,10 +37,17 @@ export class DropdownComponent { /** Состояние для открытия списка выпадающего */ @Input() isOpen = false; + /** режим создания тега */ + @Input() creatingTag = false; + /** Состояние для выделения элемента списка выпадающего */ @Input() highlightedIndex = -1; - @Input() colorText: "grey" | "black" | "red" = "grey"; + @Input() colorText: "grey" | "red" = "grey"; + + @Input() editingTag: TagData | null = null; + + @Output() updateTag = new EventEmitter(); /** Событие для выбора элемента */ @Output() select = new EventEmitter(); @@ -49,9 +59,6 @@ export class DropdownComponent { @ViewChild("dropdown", { static: true }) dropdown!: ElementRef; - /** режим создания тега */ - creatingTag = false; - getPriorityType = getPriorityType; positions: ConnectedPosition[] = [ @@ -87,20 +94,21 @@ export class DropdownComponent { this.creatingTag = true; } + onConfirmUpdateTag(tagData: TagData): void { + this.updateTag.emit(tagData); + this.creatingTag = false; + } + onConfirmCreateTag(tagInfo: { name: string; color: string }): void { this.tagInfo.emit(tagInfo); this.creatingTag = false; - this.isOpen = false; } - getTextColor(colorText: "grey" | "black" | "red") { + getTextColor(colorText: "grey" | "red") { switch (colorText) { case "red": return "color: var(--red)"; - case "black": - return "color: var(--black)"; - case "grey": return "color: var(--grey-for-text)"; } diff --git a/projects/social_platform/src/app/ui/components/modal/modal.component.html b/projects/social_platform/src/app/ui/components/modal/modal.component.html index 1e8b0690..2f3e9692 100644 --- a/projects/social_platform/src/app/ui/components/modal/modal.component.html +++ b/projects/social_platform/src/app/ui/components/modal/modal.component.html @@ -1,6 +1,6 @@ -
    +

    diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.scss b/projects/social_platform/src/app/ui/components/tag/tag.component.scss index e97773ac..5b695fdc 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.scss +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.scss @@ -21,11 +21,6 @@ color: var(--white); border: 0.5px solid transparent; - &.tag--primary { - color: var(--white); - background-color: var(--accent); - } - &.tag--secondary { background: var(--dark-grey); border: 0.5px solid var(--grey-for-text); @@ -36,11 +31,36 @@ background-color: var(--accent); } + &.tag--accent-medium { + color: var(--white); + background-color: var(--accent-medium); + } + + &.tag--blue-dark { + color: var(--white); + background-color: var(--blue-dark); + } + &.tag--complete { color: var(--white); background-color: var(--green); } + &.tag--complete-dark { + color: var(--white); + background-color: var(--green-dark); + } + + &.tag--red { + color: var(--white); + background-color: var(--red); + } + + &.tag--cyan { + color: var(--white); + background-color: var(--cyan); + } + &.tag--soft { color: var(--light-white); background: var(--gold); @@ -74,12 +94,42 @@ border: 0.5px solid var(--accent); } + &.tag--accent-medium { + color: var(--white); + background: transparent; + border: 0.5px solid var(--accent-medium); + } + + &.tag--blue-dark { + color: var(--white); + background: transparent; + border: 0.5px solid var(--blue-dark); + } + &.tag--complete { color: var(--green); background: transparent; border: 0.5px solid var(--green); } + &.tag--complete-dark { + color: var(--white); + background: transparent; + border: 0.5px solid var(--green-dark); + } + + &.tag--red { + color: var(--white); + background: transparent; + border: 0.5px solid var(--red); + } + + &.tag--cyan { + color: var(--white); + background: transparent; + border: 0.5px solid var(--cyan); + } + &.tag--soft { color: var(--gold); background: transparent; diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.ts b/projects/social_platform/src/app/ui/components/tag/tag.component.ts index a541929b..7f2559ee 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.ts +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.ts @@ -1,7 +1,17 @@ /** @format */ -import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; +import { + Component, + EventEmitter, + Input, + OnChanges, + OnInit, + Output, + SimpleChanges, +} from "@angular/core"; import { IconComponent } from "../icon/icon.component"; +import { tagColorsList } from "projects/core/src/consts/lists/tag-colots.list.const"; +import { NgStyle } from "@angular/common"; /** * Компонент тега для отображения статусов, категорий или меток. @@ -21,13 +31,23 @@ import { IconComponent } from "../icon/icon.component"; templateUrl: "./tag.component.html", styleUrl: "./tag.component.scss", standalone: true, - imports: [IconComponent], + imports: [IconComponent, NgStyle], }) -export class TagComponent implements OnInit { +export class TagComponent implements OnInit, OnChanges { constructor() {} /** Цветовая схема тега */ - @Input() color: "primary" | "secondary" | "accent" | "complete" | "soft" = "primary"; + @Input() color: + | "primary" + | "secondary" + | "accent" + | "accent-medium" + | "blue-dark" + | "cyan" + | "red" + | "complete" + | "complete-dark" + | "soft" = "primary"; /** Стиль отображения */ @Input() appearance: "inline" | "outline" = "inline"; @@ -44,7 +64,21 @@ export class TagComponent implements OnInit { /** Событие для возможности редактирования */ @Output() edit = new EventEmitter(); - ngOnInit(): void {} + get tagColorsList() { + return tagColorsList; + } + + additionalTagColor = ""; + + ngOnInit(): void { + this.mappingAdditionalTagColors(); + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes["color"]) { + this.mappingAdditionalTagColors(); + } + } /** Метод для вызова удаления элемента */ onDelete(event: MouseEvent): void { @@ -59,4 +93,11 @@ export class TagComponent implements OnInit { event.stopPropagation(); this.edit.emit(); } + + private mappingAdditionalTagColors(): void { + const found = tagColorsList.find(tagColor => tagColor.name === this.color); + if (found) { + this.additionalTagColor = found.color; + } + } } diff --git a/projects/social_platform/src/app/utils/helpers/getActionType.ts b/projects/social_platform/src/app/utils/helpers/getActionType.ts new file mode 100644 index 00000000..b4aa8cfa --- /dev/null +++ b/projects/social_platform/src/app/utils/helpers/getActionType.ts @@ -0,0 +1,11 @@ +/** @format */ + +import { actionTypeList } from "projects/core/src/consts/lists/actiion-type-list.const"; + +export const getActionType = (actionId: number) => { + const findedAction = actionTypeList.find(action => action.id === actionId); + + if (!findedAction) return "phone" as const; + + return findedAction.additionalInfo; +}; From a45b191f6ecf103721c1f5232a30c5518c719411 Mon Sep 17 00:00:00 2001 From: Awakich Date: Fri, 21 Nov 2025 18:25:20 +0300 Subject: [PATCH 10/22] add styles for skills modal, tag, task-detail --- .../shared/task/detail/task-detail.component.scss | 4 ++-- .../shared/skills-group/skills-group.component.scss | 4 ++-- .../src/app/ui/components/tag/tag.component.scss | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index ed92bcce..5aea4526 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -48,8 +48,8 @@ &-score { display: flex; - align-items: center; gap: 3px; + align-items: center; } p { @@ -397,7 +397,7 @@ @for $i from 1 through 8 { > li:nth-child(#{$i}) { ::ng-deep app-skills-group .content--open { - top: 0px; + top: 0; margin-top: -#{($i - 1) * 50}px; } } diff --git a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss b/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss index c6ac5f6f..74a37390 100644 --- a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss +++ b/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss @@ -6,6 +6,7 @@ min-height: 32px; .heading { + position: relative; display: flex; align-items: center; justify-content: space-between; @@ -13,7 +14,6 @@ height: 32px; cursor: pointer; transition: opacity 0.2s ease; - position: relative; i { transition: transform 0.2s ease; @@ -57,10 +57,10 @@ gap: 14px; &--open { - width: 40%; position: absolute; top: 0%; right: 0%; + width: 40%; } &__option { diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.scss b/projects/social_platform/src/app/ui/components/tag/tag.component.scss index 5b695fdc..2c272f9e 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.scss +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.scss @@ -97,13 +97,13 @@ &.tag--accent-medium { color: var(--white); background: transparent; - border: 0.5px solid var(--accent-medium); + border: 0.5px solid var(--accent-medium); } &.tag--blue-dark { color: var(--white); background: transparent; - border: 0.5px solid var(--blue-dark); + border: 0.5px solid var(--blue-dark); } &.tag--complete { @@ -112,7 +112,7 @@ border: 0.5px solid var(--green); } - &.tag--complete-dark { + &.tag--complete-dark { color: var(--white); background: transparent; border: 0.5px solid var(--green-dark); @@ -121,7 +121,7 @@ &.tag--red { color: var(--white); background: transparent; - border: 0.5px solid var(--red); + border: 0.5px solid var(--red); } &.tag--cyan { From d55532a29180ad3ef5c4dc783541442a65854869 Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 25 Nov 2025 18:42:22 +0300 Subject: [PATCH 11/22] add comments & rename columns mock --- .../kanban-board/kanban-board.component.html | 31 +- .../kanban-board/kanban-board.component.scss | 24 ++ .../kanban-board/kanban-board.component.ts | 50 ++- .../kanban-board/models/column.model.ts | 6 +- .../detail/kanban-board/models/task.model.ts | 18 +- .../task/detail/task-detail.component.html | 329 ++++++++++++++++-- .../task/detail/task-detail.component.scss | 60 ++++ .../task/detail/task-detail.component.ts | 207 ++++++++++- .../components/button/button.component.scss | 8 +- 9 files changed, 682 insertions(+), 51 deletions(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html index 02aa8a6a..1b2d554a 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html @@ -7,23 +7,38 @@ }
    @for (boardColumn of boardColumns(); track $index) {
    + @if (selectedColumnId === boardColumn.id && editColumn) { @if (taskForm.get("columnTitle"); + as columnTitle) { + + + } } @else {

    {{ boardColumn.tasks.length }}

    @if (boardColumn.locked) { - } + } @if (!(selectedColumnId === boardColumn.id && editColumn)) {

    {{ boardColumn.name }}

    + }
    - @if (isColumnInfoOpen && (selectedColumnId === boardColumn.order)) { + @if (isColumnInfoOpen && (selectedColumnId === boardColumn.id)) {
    + }
    @for (task of boardColumn.tasks; track task.id) { - } + } @if (addingTaskColumnId === boardColumn.id) { @if (taskForm.get("taskTitle"); as + taskTitle) { + + } }
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index 004a489c..32dea530 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -10,6 +10,30 @@ flex: 0 0 calc(33.333% - 14px); min-width: calc(33.333% - 14px); + ::ng-deep { + app-input { + .field__input { + text-align: center; + + } + .field__input--border { + border: 0.5px solid var(--accent); + } + + .field__input--big { + padding: 5px 12px; + } + + .field__input::placeholder { + text-align: center; + } + + .field__input::placeholder::-webkit-input-placeholder { + text-align: center; + } + } + } + &-wrapper { display: flex; gap: 20px; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts index 0e4f7ee1..5f00d76b 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -7,12 +7,15 @@ import { ProjectDataService } from "../services/project-data.service"; import { Project } from "@office/models/project.model"; import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; import { ActivatedRoute, Router } from "@angular/router"; -import { IconComponent } from "@ui/components"; +import { IconComponent, InputComponent } from "@ui/components"; import { KanbanTaskComponent } from "./shared/task/kanban-task.component"; import { ClickOutsideModule } from "ng-click-outside"; import { TaskDetailComponent } from "./shared/task/detail/task-detail.component"; import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; import { kanbanColumnInfo } from "projects/core/src/consts/other/kanban-column-info.const"; +import { Column } from "./models/column.model"; +import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; +import { ControlErrorPipe } from "@corelib"; @Component({ selector: "app-kanban-board", @@ -24,8 +27,11 @@ import { kanbanColumnInfo } from "projects/core/src/consts/other/kanban-column-i IconComponent, KanbanTaskComponent, ClickOutsideModule, + ReactiveFormsModule, TaskDetailComponent, DropdownComponent, + InputComponent, + ControlErrorPipe, ], standalone: true, }) @@ -33,14 +39,27 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { private readonly projectDataService = inject(ProjectDataService); private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); + private readonly fb = inject(FormBuilder); private subscriptions: Subscription[] = []; + constructor() { + this.taskForm = this.fb.group({ + columnTitle: ["", Validators.required], + }); + } + projectBoardInfo = signal(null); boardColumns = signal([]); isTaskDetailOpen = signal(false); isColumnInfoOpen = false; - selectedColumnId = 0; + selectedColumnId: number | null = null; + + editColumn = false; + + addingTaskColumnId: number | null = null; + + taskForm: FormGroup; get columnInfoOptions() { return kanbanColumnInfo; @@ -67,6 +86,14 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.subscriptions.push(projectInfo$); + const boardInfo$ = this.route.data.subscribe({ + next: columns => { + this.boardColumns.set(columns as Column[]); + }, + }); + + this.subscriptions.push(boardInfo$); + const mockColumns = [ { id: 0, @@ -105,7 +132,6 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { ], }, ]; - this.boardColumns.set(mockColumns); } @@ -130,7 +156,8 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { switch (option) { case 1: - console.log("EDIT in column:", columnId); + this.selectedColumnId = columnId!; + this.editColumn = true; break; case 2: @@ -159,4 +186,19 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { }); this.isTaskDetailOpen.set(false); } + + confirmRenameColumn(id: number) { + const title = this.taskForm.get("columnTitle")?.value; + + if (!title) return; + + this.boardColumns.update(columns => + columns.map(column => (column.id === id ? { ...column, name: title } : column)) + ); + + this.selectedColumnId = null; + this.editColumn = false; + + this.taskForm.reset(); + } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts index 240cac32..d100e87d 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts @@ -4,7 +4,9 @@ import { TaskPreview } from "./task.model"; export interface Column { id: number; - tasks: TaskPreview[]; + name: string; order: number; - // TODO: добавить даты создания и удаления + tasks: TaskPreview[]; + datetimeCreated: Date; + datetimeUpdated: Date; } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts index 78ebff94..ad82b5f3 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts @@ -7,6 +7,17 @@ import { Skill } from "@office/models/skill"; import { Tag } from "@office/models/tag.model"; import { Column } from "./column.model"; +export interface TaskResult { + description: string; + accompanyingFile: FileModel; + isVerified: boolean; + whoVerified: { + id: User["id"]; + firstName: User["firstName"]; + lastName: User["lastName"]; + }; +} + export interface TaskPreview { id: number; columnId: Column["id"]; @@ -43,10 +54,5 @@ export interface TaskDetail extends TaskPreview { id: Goal["id"]; title: Goal["title"]; }; -} - -export interface TaskResult { - id: number; - description: string; - file: FileModel; + result: TaskResult; } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html index 7139513a..104f2d4e 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html @@ -2,7 +2,77 @@
    - прикрепить результат + @if (isLeaderOrResponsibleOrPerformer) { @if (isTaskResult) { @if (isTaskResult.isVerified) { +
    + вы приняли работу + } @if (isLeaderAcceptResult) { + результат принят + } @if (isCommented) { + вы прокомментировали + } @else { + приемка + } + + результат задачи + } + + ожидание результата + } @if (isPerformer || isResponsible) { @if (isTaskResult) { @if (isCommentedByLeader) { + комментарий лидера + } + ожидание проверки + } + + {{ isTaskResult ? "результат задачи" : "прикрепить результат" }} + } +
    @if (taskDetailForm.get("action"); as action) {
    + @if (taskDetailInfo()?.creator; as creator) {
    - -

    Федор Е

    + +

    + {{ creator.firstName + " " + creator.lastName[0] }} +

    + } -

    12.10.2025 21:00

    +

    {{ taskDetailInfo()?.datetimeCreated | date: "dd.MM.yyyy HH:mm" }}

    @@ -453,38 +527,239 @@
    исполнители
    } }
    - + + + +
    + @if (messageForm.get("text"); as text) {
    -
    - - -
    + +
    -
    - @for (f of filesList; track f.id) { - + + } + +
    +
    + + +
    +
    +

    результат выполнения задачи

    + +
    + +
    + @if (sendResultForm.get("description"); as description) { +
    + + @if (description | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } @if (description | controlError: "maxlength") { +
    + {{ errorMessage.VALIDATION_TOO_LONG }} + @if (description.errors) { + {{ description.errors["maxlength"]["requiredLength"] }} + } +
    + } @if (description | controlError: "minlength") { +
    + {{ errorMessage.VALIDATION_TOO_SHORT }} + @if (description.errors) { + {{ description.errors["minlength"]["requiredLength"] }} + } +
    } +
    + } @if (sendResultForm.get("accompanyingFile"); as accompanyingFile) { + +
    + + +
    + +

    + файл в любом формате
    весом до 100МБ +

    +
    + @if (accompanyingFile | controlError: "required") { +

    загрузите файл

    + } +     +
    + } + + {{ + taskDetailInfo()?.result ? "сохранить изменения в результате работы" : "завершить задачу" + }}
    -
    --> -
    +
    + + + +
    +
    +

    результат выполнения задачи

    + +
    + + @if (taskDetailInfo()?.result; as result) { +

    {{ result.description }}

    + +
    + @if (result.accompanyingFile; as file) { + + } @if (isLeaderOrResponsibleOrPerformer) { +
    + + + + + + + +
    + } +
    + } +
    +     + + +
    +

    принять выполнение задачи

    + + + +
    + принять + + комментировать +
    +
    +     + + +
    +

    вы уверены, что хотите снять приемку работы?

    + + + + удалить результат +
    +     + + +
    +

    + вы уверены, что хотите удалить текущий результат работы +

    + + + + отменить приемку работы +
    +     + + +
    +

    + вы уверены, что исправили результат по комментариям от лидера? +

    + + + + комментарии решены +
    +     diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index 5aea4526..f2cfd7d7 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -360,6 +360,50 @@ } } +.result { + &__form { + display: flex; + flex-direction: column; + gap: 10px; + + label { + color: var(--black); + } + + &-error { + border: 0.5px solid var(--red); + } + + &--cv { + &-empty { + display: flex; + flex-direction: column; + gap: 12px; + align-items: center; + color: var(--grey-for-text); + } + } + } +} + +.lists { + &__section { + display: flex; + justify-content: space-between; + margin-bottom: 8px; + border-bottom: 0.5px solid var(--accent); + } + + &__icon { + color: var(--accent); + } + + &__title { + margin-bottom: 8px; + color: var(--accent); + } +} + .modal { &__wrapper { display: flex; @@ -426,6 +470,10 @@ text-align: center; } + &__text { + color: var(--grey-for-text); + } + &__buttons { display: flex; gap: 10px; @@ -436,4 +484,16 @@ &__button { margin-top: 20px; } + + &__footer { + display: flex; + align-items: center; + justify-content: space-between; + + &-actions { + display: flex; + gap: 20px; + align-items: center; + } + } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts index 3dc72113..72acc452 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts @@ -8,6 +8,7 @@ import { ElementRef, inject, Input, + OnDestroy, OnInit, signal, ViewChild, @@ -20,7 +21,13 @@ import { TagComponent } from "@ui/components/tag/tag.component"; import { BadgeComponent } from "@ui/components/badge/badge.component"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { ControlErrorPipe, ParseBreaksPipe, ParseLinksPipe, PluralizePipe } from "@corelib"; +import { + ControlErrorPipe, + ParseBreaksPipe, + ParseLinksPipe, + PluralizePipe, + ValidationService, +} from "@corelib"; import { expandElement } from "@utils/expand-element"; import { IconComponent } from "@uilib"; import { nanoid } from "nanoid"; @@ -33,7 +40,7 @@ import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.c import { ModalComponent } from "@ui/components/modal/modal.component"; import { SkillsService } from "@office/services/skills.service"; import { Skill } from "@office/models/skill"; -import { Subscription } from "rxjs"; +import { filter, Subscription, take } from "rxjs"; import { TaskDetail } from "../../../models/task.model"; import { daysUntil } from "@utils/days-untit"; import { KanbanBoardService } from "../../../kanban-board.service"; @@ -42,6 +49,19 @@ import { getActionType } from "@utils/helpers/getActionType"; import { ActivatedRoute } from "@angular/router"; import { TagData } from "../../create-tag-form/create-tag-form.component"; import { FileService } from "@core/services/file.service"; +import { ProfileDataService } from "@office/profile/detail/services/profile-date.service"; +import { AuthService } from "@auth/services"; +import { User } from "@auth/models/user.model"; +import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; +import { ErrorMessage } from "@error/models/error-message"; +import { SnackbarService } from "@ui/services/snackbar.service"; +import { ChatMessage } from "@office/models/chat-message.model"; +import { + CdkFixedSizeVirtualScroll, + CdkVirtualForOf, + CdkVirtualScrollViewport, +} from "@angular/cdk/scrolling"; +import { ChatMessageComponent } from "@ui/components/chat-message/chat-message.component"; @Component({ selector: "app-task-detail", @@ -68,10 +88,15 @@ import { FileService } from "@core/services/file.service"; ModalComponent, ControlErrorPipe, PluralizePipe, + UploadFileComponent, + CdkFixedSizeVirtualScroll, + CdkVirtualScrollViewport, + CdkVirtualForOf, + ChatMessageComponent, ], standalone: true, }) -export class TaskDetailComponent implements OnInit, AfterViewInit { +export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { @Input() collaborators?: Project["collaborators"]; @Input() goals?: Project["goals"]; @@ -79,7 +104,10 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { private readonly skillsService = inject(SkillsService); private readonly kanbanBoardService = inject(KanbanBoardService); + private readonly authService = inject(AuthService); private readonly fileService = inject(FileService); + private readonly snackbarService = inject(SnackbarService); + private readonly validationService = inject(ValidationService); private readonly route = inject(ActivatedRoute); private readonly cdRef = inject(ChangeDetectorRef); @@ -101,8 +129,21 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { score: [null], tagsLib: [[]], }); + + this.sendResultForm = this.fb.group({ + description: ["", Validators.required, Validators.maxLength(200)], + accompanyingFile: ["", Validators.required], + }); + + this.messageForm = this.fb.group({ + text: [""], + files: [[]], + }); } + taskDetailInfo = signal(null); + currentUser = signal(null); + isChangeDescriptionText = signal(false); remainingDaysDeadline = signal(0); @@ -112,6 +153,9 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { /** Уникальный ID для элемента input */ controlId = nanoid(3); + /** Объект с сообщениями об ошибках */ + errorMessage = ErrorMessage; + descriptionExpandable!: boolean; // Флаг необходимости кнопки "подробнее" readFullDescription = false; // Флаг показа всех вакансий @@ -123,14 +167,24 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { isGoalPickOpen = false; isTagsPickOpen = false; + isCommentedClick = false; + creatingTag = false; loadingFile = false; + sendFormIsSubmitting = false; showEditAvatarIcon = false; showEditDeadlineDatePicker = false; showEditStartDatePicker = false; showChangeGoalModal = false; + showAttachResultModal = false; + showResultModal = false; + showAcceptResultModal = false; + showUnAcceptResultModal = false; + showDeleteResultModal = false; + showLeaderCommentedResultModal = false; + skillsGroupsModalOpen = signal(false); nestedSkills$ = this.skillsService.getSkillsNested(); openGroupIds = new Set(); @@ -140,6 +194,14 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { taskDetailForm: FormGroup; + messageForm: FormGroup; + /** Сообщение, на которое отвечаем */ + replyMessage?: ChatMessage; + messages: any = []; + + /** Форма отправки результата */ + sendResultForm: FormGroup; + getPriorityType = getPriorityType; getActionType = getActionType; @@ -227,12 +289,88 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { }; } + get isPerformer() { + const user = this.currentUser(); + const taskDetail = this.taskDetailInfo(); + + if (!user || !taskDetail) return false; + + return taskDetail.performers.some(performer => performer.id === user.id); + } + + get isResponsible() { + const user = this.currentUser(); + const taskDetail = this.taskDetailInfo(); + + if (!user || !taskDetail) return false; + + return taskDetail.responsible.id === user.id; + } + + get isLeader() { + const taskDetail = this.taskDetailInfo(); + const user = this.currentUser(); + + if (!user || !taskDetail) return false; + + return taskDetail.creator.id === user.id; + } + + get isExternal() { + return !this.isLeader; + } + + get isLeaderOrResponsibleOrPerformer() { + return this.isLeader && (this.isResponsible || this.isPerformer); + } + + get isTaskResult() { + return this.taskDetailInfo()?.result; + } + + get isLeaderAcceptResult() { + const taskDetail = this.taskDetailInfo(); + + if (!taskDetail || !this.isTaskResult) return false; + + return this.isTaskResult.whoVerified.id === taskDetail.creator.id; + } + + get isCommented() { + const comments = this.taskDetailForm.get("comments")?.value; + + if (!comments) return false; + + return !!comments.length; + } + + get isCommentedByLeader() { + const comments = this.taskDetailForm.get("comments")?.value; + const taskDetail = this.taskDetailInfo(); + + if (!comments || !taskDetail) return false; + + return ( + !this.isCommented && comments.some((comment: any) => comment.id === taskDetail.creator.id) + ); + } + ngOnInit(): void { - this.taskDetailForm.valueChanges.subscribe({ - next: value => { - console.log(value); + // this.taskDetailForm.valueChanges.subscribe({ + // next: value => { + // console.log(value); + // }, + // }); + + const profileSub$ = this.authService.profile.pipe(filter(profile => !!profile)).subscribe({ + next: profile => { + if (profile) { + this.currentUser.set(profile); + } }, }); + + this.subscriptions.push(profileSub$); } /** @@ -247,6 +385,10 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { this.checkDescriptionHeigth(); } + ngOnDestroy(): void { + this.subscriptions.forEach($ => $.unsubscribe()); + } + onDeleteTaskGoal(): void { this.taskDetailForm.patchValue({ goal: null }); this.isGoalPickOpen = false; @@ -311,7 +453,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { createTag({ name, color }: { name: string; color: string }): void { const { tagsLib } = this.taskDetailForm.value; const tagInfo = { id: tagsLib.length + 1, label: name, value: name, additionalInfo: color }; - tagsLib.push(tagInfo); + tagsLib.setValue([...tagsLib, tagInfo]); } onTypeSelect( @@ -498,6 +640,47 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { this.skillsGroupsModalOpen.update(open => !open); } + /** + * Обработчик отправки формы + * Валидирует форму и отправляет результат на сервер + */ + onSubmit(): void { + // Проверка валидности формы + if (!this.validationService.getFormValidation(this.sendResultForm)) { + return; + } + + // Установка флага загрузки + this.sendFormIsSubmitting = true; + + // TODO: Отправка отклика на сервер + // this.snackbarService.success("результат работы успешно прикреплен");w + } + + /** + * Обработчик отправки сообщения + * Различает между редактированием существующего сообщения и отправкой нового + */ + onSubmitMessage(event: Event) { + if (event) event.preventDefault(); + + const text = this.messageForm.get("text")?.value?.trim(); + if (!text) return; + + // Отправка нового сообщения + const message = { + id: nanoid(), + replyTo: this.replyMessage?.id ?? null, + text, + files: this.messageForm.get("files")?.value || [], + }; + + this.messages = [...this.messages, message]; + + this.replyMessage = undefined; + this.messageForm.reset({ text: "", files: [] }); + } + /** * Добавление навыка * @param newSkill - новый навык @@ -536,6 +719,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { const taskId = this.route.snapshot.queryParams["taskId"]; const taskDetailInfo$ = this.kanbanBoardService.getTaskById(taskId).subscribe({ next: (taskDetailInfo: TaskDetail) => { + this.taskDetailInfo.set(taskDetailInfo); + this.taskDetailForm.patchValue({ title: taskDetailInfo.title ?? "", responsible: taskDetailInfo.responsible ?? null, @@ -550,6 +735,14 @@ export class TaskDetailComponent implements OnInit, AfterViewInit { description: taskDetailInfo.description ?? null, files: taskDetailInfo.files ?? [], }); + + if (taskDetailInfo.result) { + this.sendResultForm.patchValue({ + description: taskDetailInfo.result.description, + accompanyingFile: taskDetailInfo.result.accompanyingFile, + }); + } + this.remainingDaysDeadline.set( daysUntil( taskDetailInfo.deadlineDate diff --git a/projects/social_platform/src/app/ui/components/button/button.component.scss b/projects/social_platform/src/app/ui/components/button/button.component.scss index 222f881e..929a27a7 100644 --- a/projects/social_platform/src/app/ui/components/button/button.component.scss +++ b/projects/social_platform/src/app/ui/components/button/button.component.scss @@ -76,7 +76,7 @@ &.button--outline { color: var(--accent); - background-color: transparent; + background: transparent; border: 0.5px solid var(--accent); &:hover { @@ -95,9 +95,13 @@ } } + &.button--gold { + color: var(--gold); + border-color: var(--gold); + } + &.button--white { color: var(--white); - background: transparent; border: 0.5px solid var(--white); } From 3b566ec120c8ddad3504e14103402c089db2d518 Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 25 Nov 2025 18:42:53 +0300 Subject: [PATCH 12/22] add styles for rename column --- .../detail/kanban-board/kanban-board.component.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index 32dea530..f98fc18d 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -14,8 +14,8 @@ app-input { .field__input { text-align: center; - } + .field__input--border { border: 0.5px solid var(--accent); } @@ -28,8 +28,8 @@ text-align: center; } - .field__input::placeholder::-webkit-input-placeholder { - text-align: center; + .field__input::placeholder::input-placeholder { + text-align: center; } } } From b8a51c30062b56869c8ee6b3b09c8e3306b5e498 Mon Sep 17 00:00:00 2001 From: Awakich Date: Fri, 28 Nov 2025 00:34:59 +0300 Subject: [PATCH 13/22] add comments in detail task, dto's for task detail form, drag & drop of tasks, columns & crud actions for tasks & columns --- .../kanban-board/kanban-board.component.html | 73 +++++-- .../kanban-board/kanban-board.component.scss | 48 ++++- .../kanban-board/kanban-board.component.ts | 199 ++++++++++++++++-- .../models/dto/comment.model.dto.ts | 11 + .../models/dto/performer.model.dto.ts | 7 + .../kanban-board/models/dto/tag.model.dto.ts | 7 + .../detail/kanban-board/models/task.model.ts | 29 +-- .../create-tag-form.component.ts | 15 +- .../task/detail/task-detail.component.html | 76 +++---- .../task/detail/task-detail.component.scss | 57 ++++- .../task/detail/task-detail.component.ts | 180 +++++++++++++--- .../shared/task/kanban-task.component.html | 19 +- .../shared/task/kanban-task.component.ts | 3 +- .../components/dropdown/dropdown.component.ts | 12 +- .../icons/svg/{hastag.svg => hashtag.svg} | 0 .../assets/icons/symbol/svg/sprite.css.svg | 2 +- 16 files changed, 581 insertions(+), 157 deletions(-) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/comment.model.dto.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/performer.model.dto.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/tag.model.dto.ts rename projects/social_platform/src/assets/icons/svg/{hastag.svg => hashtag.svg} (100%) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html index 1b2d554a..7a94c473 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html @@ -7,21 +7,32 @@ }
    @for (boardColumn of boardColumns(); track $index) { -
    +
    @if (selectedColumnId === boardColumn.id && editColumn) { @if (taskForm.get("columnTitle"); as columnTitle) { } } @else { @@ -35,7 +46,7 @@ }
    -
    +
    @if (isColumnInfoOpen && (selectedColumnId === boardColumn.id)) { @@ -45,34 +56,55 @@ colorText="grey" (select)="onTypeSelect($event, false, boardColumn.id)" (outside)="isColumnInfoOpen = false" - [options]="columnInfoOptions" + [options]="boardColumn.id === 0 ? columnInfoOptions.slice(0, 1) : columnInfoOptions" > }
    } -
    +
    @for (task of boardColumn.tasks; track task.id) { - - } @if (addingTaskColumnId === boardColumn.id) { @if (taskForm.get("taskTitle"); as - taskTitle) { - - } } + + } @if (addTaskClick) { @if (selectedColumnId === boardColumn.id) { @if + (taskForm.get("taskTitle"); as taskTitle) { +
    + +
    + } } }
    - +
    }
    -
    +
    @@ -82,6 +114,7 @@ }
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index f98fc18d..701380c9 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -7,8 +7,9 @@ } &__column { - flex: 0 0 calc(33.333% - 14px); - min-width: calc(33.333% - 14px); + flex: 0 0 240px; + min-width: 240px; + max-width: 240px; ::ng-deep { app-input { @@ -18,6 +19,11 @@ .field__input--border { border: 0.5px solid var(--accent); + + &:focus { + border-color: none; + box-shadow: none; + } } .field__input--big { @@ -82,5 +88,43 @@ align-items: center; margin-top: 20px; overflow-y: scroll; + min-height: 20px; + } + + &__task { + width: 100%; + max-width: 245px; + padding: 6px; + cursor: pointer; + background-color: var(--white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + + ::ng-deep { + app-input { + .field__input { + padding-left: 5px; + background: transparent; + text-align: start; + } + + .field__input--border { + border: none; + + &:focus { + border-color: none; + box-shadow: none; + } + } + + .field__input::placeholder { + text-align: inherit; + } + + .field__input::placeholder::input-placeholder { + text-align: inherit; + } + } + } } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts index 5f00d76b..f5c552b5 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -1,7 +1,15 @@ /** @format */ import { CommonModule } from "@angular/common"; -import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; +import { + ChangeDetectorRef, + Component, + computed, + inject, + OnDestroy, + OnInit, + signal, +} from "@angular/core"; import { Subscription } from "rxjs"; import { ProjectDataService } from "../services/project-data.service"; import { Project } from "@office/models/project.model"; @@ -16,6 +24,14 @@ import { kanbanColumnInfo } from "projects/core/src/consts/other/kanban-column-i import { Column } from "./models/column.model"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { ControlErrorPipe } from "@corelib"; +import { + CdkDrag, + CdkDragDrop, + CdkDropList, + moveItemInArray, + transferArrayItem, +} from "@angular/cdk/drag-drop"; +import { TaskDetail, TaskPreview } from "./models/task.model"; @Component({ selector: "app-kanban-board", @@ -32,6 +48,8 @@ import { ControlErrorPipe } from "@corelib"; DropdownComponent, InputComponent, ControlErrorPipe, + CdkDropList, + CdkDrag, ], standalone: true, }) @@ -40,22 +58,28 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); private readonly fb = inject(FormBuilder); + private readonly cdRef = inject(ChangeDetectorRef); private subscriptions: Subscription[] = []; constructor() { this.taskForm = this.fb.group({ columnTitle: ["", Validators.required], + taskTitle: ["", Validators.required], }); } projectBoardInfo = signal(null); boardColumns = signal([]); + + connectedLists = computed(() => this.boardColumns().map(c => "tasks-column-" + c.id)); + isTaskDetailOpen = signal(false); isColumnInfoOpen = false; selectedColumnId: number | null = null; editColumn = false; + addTaskClick = false; addingTaskColumnId: number | null = null; @@ -107,8 +131,9 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { description: "Сейчас, чтобы создался аккаунт внтури скиллз, пользователю обязательно надо войти внутрь вкладки траектории и еще раз залогиниться...", priority: 3, + columnId: 0, }, - { id: 2, title: "создать дизайн макеты" }, + { id: 2, title: "создать дизайн макеты", columnId: 0 }, ], }, { @@ -117,8 +142,8 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { order: 1, name: "в работе", tasks: [ - { id: 3, title: "настроить API" }, - { id: 4, title: "подключить WebSocket" }, + { id: 3, title: "настроить API", columnId: 1 }, + { id: 4, title: "подключить WebSocket", columnId: 1 }, ], }, { @@ -127,8 +152,8 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { order: 2, name: "Готово", tasks: [ - { id: 5, title: "верстка страницы входа" }, - { id: 6, title: "настроить Dockerfile" }, + { id: 5, title: "верстка страницы входа", columnId: 2 }, + { id: 6, title: "настроить Dockerfile", columnId: 2 }, ], }, ]; @@ -140,11 +165,18 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { } toggleDropDown(columnId: number): void { - if (this.selectedColumnId === columnId) { + const sameColumn = this.selectedColumnId === columnId; + + if (sameColumn) { this.isColumnInfoOpen = !this.isColumnInfoOpen; - } else { - this.selectedColumnId = columnId; - this.isColumnInfoOpen = true; + return; + } + + this.selectedColumnId = columnId; + this.isColumnInfoOpen = true; + + if (this.editColumn) { + this.editColumn = false; } } @@ -153,21 +185,55 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.isColumnInfoOpen = state; return; } + this.selectedColumnId = columnId!; switch (option) { case 1: - this.selectedColumnId = columnId!; this.editColumn = true; break; case 2: - console.log("DELETE in column:", columnId); + this.deleteColumn(); break; } this.isColumnInfoOpen = state; } + startAddingTask(columnId: number): void { + if (this.isTaskDetailOpen()) return; + + this.addTaskClick = true; + this.selectedColumnId = columnId; + } + + confirmAddTask(): void { + const title = this.taskForm.get("taskTitle")?.value; + + if (!title) return; + + const newTask = { + id: Date.now(), + title, + }; + + this.boardColumns.update(columns => + columns.map(column => + column.id === this.selectedColumnId + ? { ...column, tasks: [...column.tasks, newTask] } + : column + ) + ); + + this.cancelAddingTask(); + } + + cancelAddingTask(): void { + this.selectedColumnId = null; + this.addTaskClick = false; + this.taskForm.patchValue({ taskTitle: "" }); + } + openDetailTask(taskId: number): void { this.router.navigate([], { queryParams: { @@ -187,13 +253,57 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.isTaskDetailOpen.set(false); } - confirmRenameColumn(id: number) { + onDeleteTask(): void { + const taskId = +this.route.snapshot.queryParams["taskId"]; + + if (!taskId) return; + + this.closeDetailTask(); + + this.boardColumns.update(columns => + columns.map(column => ({ + ...column, + tasks: column.tasks.filter((task: TaskPreview) => task.id !== taskId), + })) + ); + + this.cdRef.detectChanges(); + } + + addColumn(): void { + const columnTitle = this.taskForm.get("columnTitle")?.value; + + const newColumn = { + id: Date.now(), + name: columnTitle, + locked: false, + order: this.boardColumns().length, + tasks: [], + }; + + this.boardColumns.update(columns => [...columns, newColumn]); + + this.editColumn = true; + this.selectedColumnId = this.boardColumns()[this.boardColumns().length - 1].id; + } + + deleteColumn(): void { + if (this.selectedColumnId === 0) return; + + this.boardColumns.update(columns => + columns.filter(column => column.id !== this.selectedColumnId) + ); + } + + confirmRenameColumn() { const title = this.taskForm.get("columnTitle")?.value; if (!title) return; this.boardColumns.update(columns => - columns.map(column => (column.id === id ? { ...column, name: title } : column)) + columns.map(column => + column.id === this.selectedColumnId ? { ...column, name: title } : column + ) ); this.selectedColumnId = null; @@ -201,4 +311,65 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.taskForm.reset(); } + + cancelRenamColumn(): void { + this.selectedColumnId = null; + this.editColumn = false; + this.taskForm.patchValue({ columnTitle: "" }); + } + + onDropTask(event: CdkDragDrop): void { + const columns = this.boardColumns(); + + const prevColumn = columns.find(col => col.tasks === event.previousContainer.data); + const currColumn = columns.find(col => col.tasks === event.container.data); + + if (!prevColumn || !currColumn) return; + + if (event.previousContainer === event.container) { + moveItemInArray(currColumn.tasks, event.previousIndex, event.currentIndex); + } else { + transferArrayItem( + prevColumn.tasks, + currColumn.tasks, + event.previousIndex, + event.currentIndex + ); + } + + this.boardColumns.set([...columns]); + } + + onDropColumn(event: CdkDragDrop): void { + if (event.previousIndex === event.currentIndex) { + return; + } + + const columns = [...this.boardColumns()]; + + if (columns[event.previousIndex].id === 0) { + return; + } + + if (event.currentIndex === 0) { + return; + } + + if (columns[event.previousIndex].locked || columns[event.previousIndex].id === 0) { + return; + } + + moveItemInArray(columns, event.previousIndex, event.currentIndex); + + const updatedColumns = columns.map((col, index) => ({ + ...col, + order: index, + })); + + this.boardColumns.set(updatedColumns); + } + + columnDropPredicate = (index: number): boolean => { + return index !== 0; + }; } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/comment.model.dto.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/comment.model.dto.ts new file mode 100644 index 00000000..6432e704 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/comment.model.dto.ts @@ -0,0 +1,11 @@ +/** @format */ + +import { User } from "@auth/models/user.model"; + +export interface CommentDto { + id: number; + text: string; + files: FillMode[]; + author: User; + createdAt: string; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/performer.model.dto.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/performer.model.dto.ts new file mode 100644 index 00000000..b069ae9e --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/performer.model.dto.ts @@ -0,0 +1,7 @@ +/** @format */ + +export interface PerformerDto { + id: number; + avatar: string; + name: string; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/tag.model.dto.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/tag.model.dto.ts new file mode 100644 index 00000000..fcba6dab --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/tag.model.dto.ts @@ -0,0 +1,7 @@ +/** @format */ + +export interface TagDto { + id?: number; + name: string; + color: string; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts index ad82b5f3..40e7946d 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts @@ -11,11 +11,7 @@ export interface TaskResult { description: string; accompanyingFile: FileModel; isVerified: boolean; - whoVerified: { - id: User["id"]; - firstName: User["firstName"]; - lastName: User["lastName"]; - }; + whoVerified: Pick; } export interface TaskPreview { @@ -23,36 +19,23 @@ export interface TaskPreview { columnId: Column["id"]; title: string; priority: number; + action: number; description: string; deadlineDate: string; tags: Tag[]; goal: Goal; type: string; files: FileModel; - responsible: { - id: User["id"]; - avatar: User["avatar"]; - }; - performers: { - id: User["id"]; - avatar: User["avatar"]; - }[]; + responsible: Pick; + performers: Pick[]; } export interface TaskDetail extends TaskPreview { score: number; - creator: { - id: User["id"]; - firstName: User["firstName"]; - lastName: User["lastName"]; - avatar: User["avatar"]; - }; + creator: Pick; datetimeCreated: string; dateTaskStart: string; requiredSkills: Skill[]; - projectGoal: { - id: Goal["id"]; - title: Goal["title"]; - }; + projectGoal: Pick; result: TaskResult; } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts index 43ddb6b1..4c959bf7 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts @@ -19,12 +19,7 @@ import { ReactiveFormsModule, Validators, } from "@angular/forms"; - -export interface TagData { - id?: number; - name: string; - color: string; -} +import { TagDto } from "../../models/dto/tag.model.dto"; @Component({ selector: "app-create-tag-form", @@ -34,9 +29,9 @@ export interface TagData { standalone: true, }) export class CreateTagFormComponent implements OnInit, OnChanges { - @Input() editingTag: TagData | null = null; - @Output() createTag = new EventEmitter(); - @Output() updateTag = new EventEmitter(); + @Input() editingTag: TagDto | null = null; + @Output() createTag = new EventEmitter(); + @Output() updateTag = new EventEmitter(); private readonly fb = inject(FormBuilder); @@ -84,7 +79,7 @@ export class CreateTagFormComponent implements OnInit, OnChanges { event.preventDefault(); const { tagName, tagColor } = this.tagForm.value; - const tagData: TagData = { + const tagData: TagDto = { name: tagName, color: tagColor, }; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html index 104f2d4e..a27d30a9 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html @@ -527,25 +527,39 @@
    исполнители
    } }
    -
    +
    + divider image +
    + +
    - -

    {{ message.text }}

    - -     +
    +

    {{ message.createdAt | date: "dd MMMM yyyy" }}

    +
    + +
    +
    + + {{ message.author?.firstName }} {{ message.author?.lastName }} + + {{ + message.createdAt | date: "HH:MM" + }} +
    + +

    {{ message.text }}

    +
    +
    +
    -
    + @if (messageForm.get("text"); as text) {
    исполнители [hasBorder]="false" [error]="text | controlError" class="form__input text-body-12" - autosize - [autofocus]="isCommentedClick" placeholder="добавить комментарий" - (keydown.enter)="onSubmitMessage($event)" + [appValue]="messageForm.get('text')?.value" + (keydown.enter)="onEnterKeyDown($event)" > - - + +
    + + + +
    - }
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index f2cfd7d7..5d777854 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -208,7 +208,7 @@ display: flex; gap: 10px; align-items: center; - margin-bottom: 40px; + margin-bottom: 10px; } &-file { @@ -221,6 +221,12 @@ } } + &-comments { + display: flex; + flex-direction: column; + margin-top: 20px; + } + i { color: var(--accent); } @@ -232,6 +238,49 @@ } } +.messages { + &__wrapper { + margin-bottom: 12px; + } + + &__date { + color: var(--grey-for-text); + text-align: center; + } +} + +.message { + display: flex; + align-items: flex-start; + gap: 10px; + + &__wrapper { + display: flex; + flex-direction: column; + flex-grow: 1; + width: 100%; + gap: 5px; + } + + &__header { + display: flex; + align-items: flex-start; + justify-content: space-between; + } + + &__author { + color: var(--accent) !important; + } + + &__time { + color: var(--grey-for-text) !important; + } + + p { + color: var(--black); + } +} + .about { /* stylelint-disable value-no-vendor-prefix */ &__text { @@ -325,6 +374,7 @@ display: flex; gap: 5px; align-items: center; + cursor: pointer; i { color: var(--light-white); @@ -338,6 +388,7 @@ &__attach { i { color: var(--dark-grey); + opacity: 0.5; } } @@ -349,6 +400,10 @@ cursor: pointer; background-color: var(--accent); border-radius: var(--rounded-sm); + + i { + color: var(--white); + } } &__input { diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts index 72acc452..a996132f 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts @@ -6,10 +6,12 @@ import { ChangeDetectorRef, Component, ElementRef, + EventEmitter, inject, Input, OnDestroy, OnInit, + Output, signal, ViewChild, } from "@angular/core"; @@ -40,16 +42,14 @@ import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.c import { ModalComponent } from "@ui/components/modal/modal.component"; import { SkillsService } from "@office/services/skills.service"; import { Skill } from "@office/models/skill"; -import { filter, Subscription, take } from "rxjs"; +import { filter, map, Subscription, take } from "rxjs"; import { TaskDetail } from "../../../models/task.model"; import { daysUntil } from "@utils/days-untit"; import { KanbanBoardService } from "../../../kanban-board.service"; import { getPriorityType } from "@utils/helpers/getPriorityType"; import { getActionType } from "@utils/helpers/getActionType"; import { ActivatedRoute } from "@angular/router"; -import { TagData } from "../../create-tag-form/create-tag-form.component"; import { FileService } from "@core/services/file.service"; -import { ProfileDataService } from "@office/profile/detail/services/profile-date.service"; import { AuthService } from "@auth/services"; import { User } from "@auth/models/user.model"; import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; @@ -62,6 +62,9 @@ import { CdkVirtualScrollViewport, } from "@angular/cdk/scrolling"; import { ChatMessageComponent } from "@ui/components/chat-message/chat-message.component"; +import { CommentDto } from "../../../models/dto/comment.model.dto"; +import { TagDto } from "../../../models/dto/tag.model.dto"; +import { PerformerDto } from "../../../models/dto/performer.model.dto"; @Component({ selector: "app-task-detail", @@ -100,7 +103,11 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { @Input() collaborators?: Project["collaborators"]; @Input() goals?: Project["goals"]; + @Output() delete = new EventEmitter(); + @ViewChild("descEl") descEl?: ElementRef; + /** Ссылка на viewport для автопрокрутки */ + @ViewChild(CdkVirtualScrollViewport) viewport?: CdkVirtualScrollViewport; private readonly skillsService = inject(SkillsService); private readonly kanbanBoardService = inject(KanbanBoardService); @@ -148,7 +155,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { remainingDaysDeadline = signal(0); - editingTag: TagData | null = null; + editingTag: TagDto | null = null; /** Уникальный ID для элемента input */ controlId = nanoid(3); @@ -190,14 +197,21 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { openGroupIds = new Set(); openGroupIndex: number | null = null; - filesList: any[] = []; - taskDetailForm: FormGroup; messageForm: FormGroup; /** Сообщение, на которое отвечаем */ replyMessage?: ChatMessage; - messages: any = []; + messages = signal([]); + + /** Массив прикрепленных файлов с метаданными */ + attachFiles: { + name: string; + size: string; + type: string; + link?: string; + loading: boolean; + }[] = []; /** Форма отправки результата */ sendResultForm: FormGroup; @@ -351,7 +365,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { if (!comments || !taskDetail) return false; return ( - !this.isCommented && comments.some((comment: any) => comment.id === taskDetail.creator.id) + !this.isCommented && + comments.some((comment: CommentDto) => comment.id === taskDetail.creator.id) ); } @@ -397,7 +412,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { onDeleteTaskTag(tagId: number): void { const tags = this.taskDetailForm.get("tags")?.value || []; - const remainingTags = tags.filter((tag: any) => tag.id !== tagId); + const remainingTags = tags.filter((tag: TagDto) => tag.id !== tagId); this.taskDetailForm.patchValue({ tags: remainingTags }); this.isTagsPickOpen = false; @@ -407,21 +422,21 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { this.isTagsPickOpen = !this.isTagsPickOpen; this.creatingTag = true; - const tags = this.taskDetailForm.get("tags")?.value || []; - const tag = tags.find((t: any) => t.id === tagId); + const tags: TagDto[] = this.taskDetailForm.get("tags")?.value || []; + const tag = tags.find((tag: TagDto) => tag.id === tagId); if (tag) { this.editingTag = { id: tag.id, - name: tag.title, + name: tag.name, color: tag.color, }; } } - onUpdateTag({ id, name, color }: TagData): void { + onUpdateTag({ id, name, color }: TagDto): void { const tagsLib = [...(this.taskDetailForm.get("tagsLib")?.value || [])]; - const libIndex = tagsLib.findIndex((t: any) => t.id === id); + const libIndex = tagsLib.findIndex((tag: TagDto) => tag.id === id); if (libIndex !== -1) { tagsLib[libIndex] = { @@ -434,13 +449,13 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { this.taskDetailForm.patchValue({ tagsLib: [...tagsLib] }); } - const tags = [...(this.taskDetailForm.get("tags")?.value || [])]; - const tagIndex = tags.findIndex((t: any) => t.id === id); + const tags: TagDto[] = [...(this.taskDetailForm.get("tags")?.value || [])]; + const tagIndex = tags.findIndex((tag: TagDto) => tag.id === id); if (tagIndex !== -1) { tags[tagIndex] = { ...tags[tagIndex], - title: name, + name, color, }; this.taskDetailForm.patchValue({ tags: [...tags] }); @@ -501,14 +516,16 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { const collaborator = this.collaborators.find( collaborator => collaborator.userId === typeId ); - const currentPerformers = this.taskDetailForm.get("performers")?.value || []; + const currentPerformers: PerformerDto[] = + this.taskDetailForm.get("performers")?.value || []; const payload = { id: collaborator?.userId, avatar: collaborator?.avatar, name: collaborator?.firstName + " " + collaborator?.lastName[0], }; - if (currentPerformers.some((performer: any) => performer.id === payload.id)) return; + if (currentPerformers.some((performer: PerformerDto) => performer.id === payload.id)) + return; this.taskDetailForm.patchValue({ performers: [...currentPerformers, payload], @@ -539,11 +556,11 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { } if (typeId !== undefined) { - const tag = this.tagsPickOptions.find((tag: any) => tag.id === typeId); + const tag = this.tagsPickOptions.find((tag: TagDto) => tag.id === typeId); const payload = { id: tag?.id, title: tag?.label, color: tag?.additionalInfo }; const currentTags = this.taskDetailForm.get("tags")?.value || []; - if (currentTags.some((tag: any) => tag.id === payload.id)) return; + if (currentTags.some((tag: TagDto) => tag.id === payload.id)) return; this.taskDetailForm.patchValue({ tags: [...currentTags, payload] }); } else { this.editingTag = null; @@ -554,6 +571,9 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { } case "delete": + if (typeId !== undefined) { + this.delete.emit(); + } this.isDeleteTypeOpen = state; break; @@ -607,6 +627,59 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { }); } + /** + * Обработчик загрузки файлов через input + * @param evt - событие выбора файлов + */ + onUpload(evt: Event) { + const files = (evt.currentTarget as HTMLInputElement).files; + + if (!files?.length) { + return; + } + + this.addFiles(files); + } + + /** + * Добавление файлов для загрузки + * Создает записи в массиве attachFiles и запускает загрузку на сервер + * @param files - список файлов для загрузки + */ + private addFiles(files: FileList): void { + // Создание записей для каждого файла + for (let i = 0; i < files.length; i++) { + this.attachFiles.push({ + name: files[i].name, + size: files[i].size.toString(), + type: files[i].type, + loading: true, + }); + } + + // Загрузка каждого файла на сервер + for (let i = 0; i < files.length; i++) { + this.fileService + .uploadFile(files[i]) + .pipe(map(r => r.url)) + .subscribe({ + next: url => { + console.log(url); + + setTimeout(() => { + this.attachFiles[i].loading = false; + this.attachFiles[i].link = url; + }); + }, + complete: () => { + setTimeout(() => { + this.attachFiles[i].loading = false; + }); + }, + }); + } + } + /** * Переключение навыка в списке выбранных * @param toggledSkill - навык для переключения @@ -654,31 +727,59 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { this.sendFormIsSubmitting = true; // TODO: Отправка отклика на сервер - // this.snackbarService.success("результат работы успешно прикреплен");w + // this.snackbarService.success("результат работы успешно прикреплен"); } /** - * Обработчик отправки сообщения - * Различает между редактированием существующего сообщения и отправкой нового + * Отправка сообщения */ - onSubmitMessage(event: Event) { - if (event) event.preventDefault(); - + onSubmitMessage(): void { const text = this.messageForm.get("text")?.value?.trim(); + if (!text) return; - // Отправка нового сообщения - const message = { - id: nanoid(), - replyTo: this.replyMessage?.id ?? null, + const newMessage = { + id: Date.now(), text, + author: this.currentUser(), + createdAt: new Date().toISOString(), + isRead: false, + replyTo: this.replyMessage?.id ?? null, files: this.messageForm.get("files")?.value || [], }; - this.messages = [...this.messages, message]; + this.messages.update(messages => [...messages, newMessage]); + + this.messageForm.reset({ + text: "", + files: [], + }); this.replyMessage = undefined; - this.messageForm.reset({ text: "", files: [] }); + this.scrollToBottom(); + } + + onEnterKeyDown(event: Event): void { + const keyboardEvent = event as KeyboardEvent; + + if (keyboardEvent.key === "Enter" && !keyboardEvent.shiftKey) { + event.preventDefault(); + this.onSubmitMessage(); + } + } + + /** + * Установка сообщения для ответа (заготовка) + */ + onReplyMessage(messageId: number): void { + this.replyMessage = this.messages().find(message => message.id === messageId); + } + + /** + * Отмена ответа + */ + onCancelReply(): void { + this.replyMessage = undefined; } /** @@ -695,6 +796,19 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { this.cdRef.markForCheck(); } + /** + * Прокрутка к низу списка сообщений + */ + private scrollToBottom(): void { + setTimeout(() => { + this.viewport?.scrollTo({ bottom: 0 }); + + setTimeout(() => { + this.viewport?.scrollTo({ bottom: 0 }); + }, 50); + }); + } + /** * Удаление навыка * @param oddSkill - навык для удаления diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html index 435af216..d6897f5a 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html @@ -5,15 +5,16 @@ {{ task.title }} @if (task.description) {

    {{ task.description }}

    - } @if (task?.responsible || task?.performers?.length || task?.files?.length || task.action) { + } @if (task.responsible || (task.performers && task.performers.length > 0) || task.files || + task.action) {
    - @if (task?.responsible; as responsible) { + @if (task.responsible; as responsible) {
    - } @if (task?.performers; as performers) { @if (performers.length > 0) { @for (performer of + } @if (task.performers; as performers) { @if (performers.length > 0) { @for (performer of performers; track $index) {
    @@ -22,24 +23,24 @@ } } }
    - @if (task?.files?.length || task?.action) { + @if (task.files || task.action) {
    }
    - } @if (task?.deadline || task?.tag || task?.goal) { + } @if (task.deadlineDate || task.tags || task.goal) {
    - @if (task.deadline) { + @if (task.deadlineDate) {

    04.04.2026

    - } @if (task.tag; as tag) { - {{ "#" + tag.text }} + } @if (task.tags[0]; as tag) { + {{ "#" + tag.name }} } @if (task.goal; as goal) { - {{ goal.text }} + {{ goal.title }} }
    } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts index d7136c98..587e0fc1 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts @@ -7,6 +7,7 @@ import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { TagComponent } from "@ui/components/tag/tag.component"; import { RouterModule } from "@angular/router"; import { getPriorityType } from "@utils/helpers/getPriorityType"; +import { TaskPreview } from "../../models/task.model"; @Component({ selector: "app-kanban-task", @@ -16,7 +17,7 @@ import { getPriorityType } from "@utils/helpers/getPriorityType"; standalone: true, }) export class KanbanTaskComponent { - @Input({ required: true }) task: any; + @Input({ required: true }) task!: TaskPreview; getPriorityType = getPriorityType; } diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts index 166651e4..56313e49 100644 --- a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts @@ -8,10 +8,8 @@ import { IconComponent } from "@uilib"; import { getPriorityType } from "@utils/helpers/getPriorityType"; import { TagComponent } from "../tag/tag.component"; import { ClickOutsideModule } from "ng-click-outside"; -import { - CreateTagFormComponent, - TagData, -} from "@office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component"; +import { CreateTagFormComponent } from "@office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component"; +import { TagDto } from "@office/projects/detail/kanban-board/models/dto/tag.model.dto"; @Component({ selector: "app-dropdown", @@ -45,9 +43,9 @@ export class DropdownComponent { @Input() colorText: "grey" | "red" = "grey"; - @Input() editingTag: TagData | null = null; + @Input() editingTag: TagDto | null = null; - @Output() updateTag = new EventEmitter(); + @Output() updateTag = new EventEmitter(); /** Событие для выбора элемента */ @Output() select = new EventEmitter(); @@ -94,7 +92,7 @@ export class DropdownComponent { this.creatingTag = true; } - onConfirmUpdateTag(tagData: TagData): void { + onConfirmUpdateTag(tagData: TagDto): void { this.updateTag.emit(tagData); this.creatingTag = false; } diff --git a/projects/social_platform/src/assets/icons/svg/hastag.svg b/projects/social_platform/src/assets/icons/svg/hashtag.svg similarity index 100% rename from projects/social_platform/src/assets/icons/svg/hastag.svg rename to projects/social_platform/src/assets/icons/svg/hashtag.svg diff --git a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg index cffdd94d..6448c6e9 100644 --- a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg +++ b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From e6f07222d4a9f5e9c7f05511559ff5c12fc50df7 Mon Sep 17 00:00:00 2001 From: Awakich Date: Fri, 28 Nov 2025 00:35:43 +0300 Subject: [PATCH 14/22] add styles for tasks & task-detail --- .../projects/detail/kanban-board/kanban-board.component.scss | 4 ++-- .../shared/task/detail/task-detail.component.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss index 701380c9..c0827a47 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss @@ -86,9 +86,9 @@ flex-direction: column; gap: 20px; align-items: center; + min-height: 20px; margin-top: 20px; overflow-y: scroll; - min-height: 20px; } &__task { @@ -104,8 +104,8 @@ app-input { .field__input { padding-left: 5px; - background: transparent; text-align: start; + background: transparent; } .field__input--border { diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index 5d777854..fc084857 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -251,15 +251,15 @@ .message { display: flex; - align-items: flex-start; gap: 10px; + align-items: flex-start; &__wrapper { display: flex; flex-direction: column; flex-grow: 1; - width: 100%; gap: 5px; + width: 100%; } &__header { From bf5469ef186d4331eb03b7e2df05208577b10387 Mon Sep 17 00:00:00 2001 From: Awakich Date: Sun, 30 Nov 2025 16:28:27 +0300 Subject: [PATCH 15/22] fix services of program & project to signals, add service for kanban on signals, dto's for project --- .../features/detail/detail.component.html | 4 +- .../features/detail/detail.component.ts | 42 +-- .../src/app/office/models/goals.model.ts | 2 +- .../src/app/office/models/partner.model.ts | 14 +- .../src/app/office/models/resource.model.ts | 2 +- .../src/app/office/models/tag.model.ts | 8 +- .../program/detail/main/main.component.ts | 3 +- .../program/services/program-data.service.ts | 20 +- .../rating-card/rating-card.component.ts | 16 +- .../projects/detail/chat/chat.component.html | 4 +- .../projects/detail/chat/chat.component.ts | 16 +- .../kanban-board/kanban-board.component.html | 12 +- .../kanban-board/kanban-board.component.ts | 19 +- .../kanban-board/kanban-board.resolver.ts | 2 +- .../detail/kanban-board/models/task.model.ts | 24 +- .../services/kanban-board-info.service.ts | 117 ++++++ .../{ => services}/kanban-board.service.ts | 2 +- .../kanban-board-actions.component.html | 2 + .../actions/kanban-board-actions.component.ts | 8 +- .../sidebar/kanban-board-sidebar.component.ts | 7 +- .../task/detail/task-detail.component.html | 212 ++++++----- .../task/detail/task-detail.component.scss | 27 +- .../task/detail/task-detail.component.ts | 350 +++++++++--------- .../shared/task/kanban-task.component.html | 4 +- .../detail/services/project-data.service.ts | 34 +- .../projects/detail/team/team.component.html | 4 +- .../projects/detail/team/team.component.ts | 72 ++-- .../detail/vacancies/vacancies.component.html | 4 +- .../detail/vacancies/vacancies.component.ts | 12 +- .../office/projects/edit/edit.component.ts | 4 +- .../edit/services/project-goals.service.ts | 4 +- .../edit/services/project-partner.service.ts | 4 +- .../services/project-resources.service.ts | 8 +- .../app/office/services/project.service.ts | 24 +- .../components/button/button.component.scss | 5 + .../src/app/utils/helpers/isExist.ts | 5 + 36 files changed, 587 insertions(+), 510 deletions(-) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board-info.service.ts rename projects/social_platform/src/app/office/projects/detail/kanban-board/{ => services}/kanban-board.service.ts (92%) create mode 100644 projects/social_platform/src/app/utils/helpers/isExist.ts diff --git a/projects/social_platform/src/app/office/features/detail/detail.component.html b/projects/social_platform/src/app/office/features/detail/detail.component.html index 56dba930..1af5c507 100644 --- a/projects/social_platform/src/app/office/features/detail/detail.component.html +++ b/projects/social_platform/src/app/office/features/detail/detail.component.html @@ -86,8 +86,8 @@ } } @if (isUserMember && !isUserManager && !isUserExpert) { (undefined); profile?: User; listType: "project" | "program" | "profile" = "project"; @@ -88,7 +98,6 @@ export class DeatilComponent implements OnInit, OnDestroy { // Сторонние переменные для работы с роутингом или доп проверок backPath?: string; - registerDateExpired?: boolean; isInProject?: boolean; isSended = false; @@ -422,31 +431,15 @@ export class DeatilComponent implements OnInit, OnDestroy { private initializeInfo() { if (this.listType === "project") { - const projectSub$ = this.projectDataService.project$ - .pipe(filter(project => !!project)) - .subscribe(project => { - this.info.set(project); - - if (project?.partnerProgram) { - this.isEditDisable = project.partnerProgram?.isSubmitted; - } - }); + const project = this.projectDataService.project; + this.info = project; - this.isInProfileInfo(); + this.isEditDisable = this.info()?.partnerProgram?.isSubmitted ?? false; - this.subscriptions.push(projectSub$); + this.isInProfileInfo(); } else if (this.listType === "program") { - const program$ = this.programDataService.program$ - .pipe( - filter(program => !!program), - tap(program => { - if (program) { - this.info.set(program); - this.registerDateExpired = Date.now() > Date.parse(program.datetimeRegistrationEnds); - } - }) - ) - .subscribe(); + const program = this.programDataService.program; + this.info = program; const profileDataSub$ = this.authService.profile.pipe(filter(user => !!user)).subscribe({ next: user => { @@ -462,7 +455,6 @@ export class DeatilComponent implements OnInit, OnDestroy { }, }); - this.subscriptions.push(program$); this.subscriptions.push(memeberProjects$); this.subscriptions.push(profileDataSub$); } else { diff --git a/projects/social_platform/src/app/office/models/goals.model.ts b/projects/social_platform/src/app/office/models/goals.model.ts index 7a4aac24..78062011 100644 --- a/projects/social_platform/src/app/office/models/goals.model.ts +++ b/projects/social_platform/src/app/office/models/goals.model.ts @@ -17,7 +17,7 @@ class ResponsibleInfo { avatar!: string | null; } -export class GoalPostForm { +export class GoalDto { id?: number; title!: string; completionDate!: string; diff --git a/projects/social_platform/src/app/office/models/partner.model.ts b/projects/social_platform/src/app/office/models/partner.model.ts index c1598071..b32344f8 100644 --- a/projects/social_platform/src/app/office/models/partner.model.ts +++ b/projects/social_platform/src/app/office/models/partner.model.ts @@ -6,15 +6,15 @@ interface Company { inn: string; } -export interface Partner { - id: number; - projecId: number; - company: Company; - contribution: string; - decisionMaker: number; +export class Partner { + id!: number; + projecId!: number; + company!: Company; + contribution!: string; + decisionMaker!: number; } -export interface PartnerPostForm { +export interface PartnerDto { name: string; inn: string; contribution: string; diff --git a/projects/social_platform/src/app/office/models/resource.model.ts b/projects/social_platform/src/app/office/models/resource.model.ts index ca4a5542..6c735fd4 100644 --- a/projects/social_platform/src/app/office/models/resource.model.ts +++ b/projects/social_platform/src/app/office/models/resource.model.ts @@ -8,7 +8,7 @@ export interface Resource { partnerCompany: number; } -export interface ResourcePostForm { +export interface ResourceDto { projectId: number; type: string; description: string; diff --git a/projects/social_platform/src/app/office/models/tag.model.ts b/projects/social_platform/src/app/office/models/tag.model.ts index a5a5118a..074bbf5f 100644 --- a/projects/social_platform/src/app/office/models/tag.model.ts +++ b/projects/social_platform/src/app/office/models/tag.model.ts @@ -1,7 +1,7 @@ /** @format */ -export interface Tag { - id: number; - name: string; - color: string; +export class Tag { + id!: number; + name!: string; + color!: string; } diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.ts b/projects/social_platform/src/app/office/program/detail/main/main.component.ts index fe8fa27d..b6f1d533 100644 --- a/projects/social_platform/src/app/office/program/detail/main/main.component.ts +++ b/projects/social_platform/src/app/office/program/detail/main/main.component.ts @@ -41,7 +41,6 @@ import { AsyncPipe } from "@angular/common"; import { AvatarComponent } from "@uilib"; import { NewsCardComponent } from "@office/features/news-card/news-card.component"; import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; -import { NewsCardComponent } from "@office/features/news-card/news-card.component"; @Component({ selector: "app-main", @@ -227,7 +226,7 @@ export class ProgramDetailMainComponent implements OnInit, OnDestroy { } @ViewChild(NewsFormComponent) newsFormComponent?: NewsFormComponent; - @ViewChild(ProgramNewsCardComponent) ProgramNewsCardComponent?: ProgramNewsCardComponent; + @ViewChild(NewsCardComponent) ProgramNewsCardComponent?: NewsCardComponent; @ViewChild("descEl") descEl?: ElementRef; onNewsInVew(entries: IntersectionObserverEntry[]): void { diff --git a/projects/social_platform/src/app/office/program/services/program-data.service.ts b/projects/social_platform/src/app/office/program/services/program-data.service.ts index 0ba988f0..16fb879c 100644 --- a/projects/social_platform/src/app/office/program/services/program-data.service.ts +++ b/projects/social_platform/src/app/office/program/services/program-data.service.ts @@ -1,17 +1,27 @@ /** @format */ -import { Injectable } from "@angular/core"; -import { BehaviorSubject } from "rxjs"; +import { computed, Injectable, signal } from "@angular/core"; import { Program } from "../models/program.model"; @Injectable({ providedIn: "root", }) export class ProgramDataService { - private programSubject$ = new BehaviorSubject(undefined); - program$ = this.programSubject$.asObservable(); + program = signal(undefined); setProgram(program: Program): void { - return this.programSubject$.next(program); + return this.program.set(program); } + + programDateFinished = computed(() => { + const program = this.program(); + return program?.datetimeFinished ? Date.now() > Date.parse(program.datetimeFinished) : false; + }); + + registerDateExpired = computed(() => { + const program = this.program(); + return program?.datetimeRegistrationEnds + ? Date.now() > Date.parse(program.datetimeRegistrationEnds) + : false; + }); } diff --git a/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts b/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts index de4d79fa..d66d2dba 100644 --- a/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts +++ b/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts @@ -146,7 +146,8 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy { isProjectCriterias = signal(0); - programDateFinished = signal(false); + readonly programDateFinished = this.programDataService.programDateFinished; + readonly program = this.programDataService.program; desktopMode$: Observable = this.breakpointObserver .observe("(min-width: 920px)") @@ -161,19 +162,6 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy { this.projectRated.set(isScored); } - const program$ = this.programDataService.program$ - .pipe( - filter(program => !!program), - tap(program => { - if (program && program.datetimeFinished) { - this.programDateFinished.set(Date.now() > Date.parse(program.datetimeFinished)); - } - }) - ) - .subscribe(); - - this.subscriptions$().push(program$); - const profileId$ = this.authService.profile.subscribe({ next: profile => { this.profile.set(profile); diff --git a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.html b/projects/social_platform/src/app/office/projects/detail/chat/chat.component.html index c73d6fe1..8559be0e 100644 --- a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.html +++ b/projects/social_platform/src/app/office/projects/detail/chat/chat.component.html @@ -1,5 +1,5 @@ -@if (project) { +@if (project()) {
    @if (!messages.length) { @@ -30,7 +30,7 @@

    участники

    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts index f5c552b5..88070357 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts @@ -31,7 +31,8 @@ import { moveItemInArray, transferArrayItem, } from "@angular/cdk/drag-drop"; -import { TaskDetail, TaskPreview } from "./models/task.model"; +import { TaskPreview } from "./models/task.model"; +import { KanbanBoardInfoService } from "./services/kanban-board-info.service"; @Component({ selector: "app-kanban-board", @@ -54,7 +55,7 @@ import { TaskDetail, TaskPreview } from "./models/task.model"; standalone: true, }) export class KanbanBoardComponent implements OnInit, OnDestroy { - private readonly projectDataService = inject(ProjectDataService); + private readonly kanbanBoardInfoService = inject(KanbanBoardInfoService); private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); private readonly fb = inject(FormBuilder); @@ -68,7 +69,6 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { }); } - projectBoardInfo = signal(null); boardColumns = signal([]); connectedLists = computed(() => this.boardColumns().map(c => "tasks-column-" + c.id)); @@ -89,6 +89,9 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { return kanbanColumnInfo; } + readonly isLeader = this.kanbanBoardInfoService.isLeader(); + readonly isExternal = this.kanbanBoardInfoService.isExternal(); + ngOnInit(): void { const detailInfoUrl$ = this.route.queryParams.subscribe({ next: params => { @@ -100,16 +103,6 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { this.subscriptions.push(detailInfoUrl$); - const projectInfo$ = this.projectDataService.project$.subscribe({ - next: project => { - if (project) { - this.projectBoardInfo.set(project); - } - }, - }); - - this.subscriptions.push(projectInfo$); - const boardInfo$ = this.route.data.subscribe({ next: columns => { this.boardColumns.set(columns as Column[]); diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts index 71b0691b..456b30fa 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts @@ -1,7 +1,7 @@ /** @format */ import { inject } from "@angular/core"; -import { KanbanBoardService } from "./kanban-board.service"; +import { KanbanBoardService } from "./services/kanban-board.service"; import { ActivatedRouteSnapshot, Router } from "@angular/router"; import { catchError, map, of } from "rxjs"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts index 40e7946d..59e9ab5b 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts @@ -9,7 +9,7 @@ import { Column } from "./column.model"; export interface TaskResult { description: string; - accompanyingFile: FileModel; + accompanyingFile: FileModel | null; isVerified: boolean; whoVerified: Pick; } @@ -18,24 +18,24 @@ export interface TaskPreview { id: number; columnId: Column["id"]; title: string; + type: number; priority: number; - action: number; - description: string; - deadlineDate: string; + description: string | null; + deadlineDate: string | null; tags: Tag[]; - goal: Goal; - type: string; - files: FileModel; - responsible: Pick; - performers: Pick[]; + goal: Pick | null; + files: FileModel[]; + responsible: Pick | null; + performers: Pick[] | null; } export interface TaskDetail extends TaskPreview { score: number; creator: Pick; datetimeCreated: string; - dateTaskStart: string; + datetimeTaskStart: string; requiredSkills: Skill[]; - projectGoal: Pick; - result: TaskResult; + isLeaderLeaveComment: boolean; + projectGoal: Pick | null; + result: TaskResult | null; } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board-info.service.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board-info.service.ts new file mode 100644 index 00000000..3bc65f00 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board-info.service.ts @@ -0,0 +1,117 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { TaskDetail } from "../models/task.model"; +import { User } from "@auth/models/user.model"; +import { AuthService } from "@auth/services"; +import { filter } from "rxjs"; +import { ProjectDataService } from "../../services/project-data.service"; + +@Injectable({ + providedIn: "root", +}) +export class KanbanBoardInfoService { + taskDetail = signal( + undefined + // { + // id: 5, + // columnId: 0, + // title: "Начинаем новый проект", + // priority: 0, + // type: 2, + // description: null, + // deadlineDate: "12-11-2025", + // tags: [], + // goal: null, + // files: [], + // responsible: null, + // performers: [], + // score: 10, + // creator: + // { + // id: 56, + // avatar: "https://api.selcdn.ru/v1/SEL_228194/procollab_media/5388035211510428528/2458680223122098610_2202079899633949339.webp", + // firstName: "Егоg", + // lastName: "Токареg", + // }, + // datetimeCreated: "11-10-2025 12:00", + // datetimeTaskStart: "11-11-2025", + // requiredSkills: [], + // isLeaderLeaveComment: false, + // projectGoal: null, + // result: null, + + // // result: { + // // isVerified: false, + // // description: "123", + // // accompanyingFile: null, + // // whoVerified: { + // // id: 11, + // // firstName: "Егоg", + // // lastName: "Токареg", + // // } + // // }, + // } + ); + + currentUser = signal(null); + + private readonly authService = inject(AuthService); + private readonly projectDataService = inject(ProjectDataService); + + constructor() { + this.authService.profile + .pipe(filter(Boolean)) + .subscribe(profile => this.currentUser.set(profile)); + } + + setTaskDetailInfo(detail: TaskDetail | undefined) { + this.taskDetail.set(detail); + } + + leaderId = this.projectDataService.leaderId; + collaborators = this.projectDataService.collaborators; + + isLeader = computed(() => { + const user = this.currentUser(); + const leader = this.leaderId(); + return !!user && user.id === leader; + }); + + isCreator = computed(() => { + const user = this.currentUser(); + const task = this.taskDetail(); + return !!user && user.id === task?.creator?.id; + }); + + isPerformer = computed(() => { + const user = this.currentUser(); + const task = this.taskDetail(); + return !!user && !!task?.performers?.some(p => p.id === user.id); + }); + + isResponsible = computed(() => { + const user = this.currentUser(); + const task = this.taskDetail(); + return !!user && user.id === task?.responsible?.id; + }); + + isExternal = computed(() => { + return !(this.isLeader() || this.isCreator() || this.isPerformer() || this.isResponsible()); + }); + + isTaskResult = computed(() => { + return this.taskDetail()?.result; + }); + + isLeaderAcceptResult = computed(() => { + const result = this.isTaskResult(); + const leaderId = this.leaderId(); + + if (!leaderId || !result) return false; + + return !!result && result.isVerified && result.whoVerified.id === leaderId; + }); + + isLeaderLeaveComment = computed(() => this.taskDetail()?.isLeaderLeaveComment); +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board.service.ts similarity index 92% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts rename to projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board.service.ts index ccd279e2..b78fcf39 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.service.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board.service.ts @@ -2,7 +2,7 @@ import { inject, Injectable } from "@angular/core"; import { ApiService } from "@corelib"; -import { TaskDetail } from "./models/task.model"; +import { TaskDetail } from "../models/task.model"; import { Observable } from "rxjs"; @Injectable({ diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html index 5a53c041..0bac38b6 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html @@ -11,7 +11,9 @@
    + @if (isLeader()) {
    + } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts index 5cd91570..6a507c8a 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts @@ -1,8 +1,9 @@ /** @format */ import { CommonModule } from "@angular/common"; -import { Component } from "@angular/core"; +import { Component, inject } from "@angular/core"; import { IconComponent } from "@uilib"; +import { KanbanBoardInfoService } from "../../services/kanban-board-info.service"; @Component({ selector: "app-kanban-board-actions", @@ -11,4 +12,7 @@ import { IconComponent } from "@uilib"; imports: [CommonModule, IconComponent], standalone: true, }) -export class KanbanBoardActionsComponent {} +export class KanbanBoardActionsComponent { + private readonly kanbanBoardInfoService = inject(KanbanBoardInfoService); + readonly isLeader = this.kanbanBoardInfoService.isLeader; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts index 4ffd7a86..803d1cc7 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts @@ -1,12 +1,13 @@ /** @format */ import { CommonModule } from "@angular/common"; -import { Component, Input, signal } from "@angular/core"; +import { Component, inject, Input, signal } from "@angular/core"; import { Project } from "@office/models/project.model"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { KanbanBoardActionsComponent } from "../actions/kanban-board-actions.component"; import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; import { ClickOutsideModule } from "ng-click-outside"; +import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; @Component({ selector: "app-kanban-board-sidebar", @@ -22,10 +23,12 @@ import { ClickOutsideModule } from "ng-click-outside"; standalone: true, }) export class KanbanBoardSidebarComponent { - @Input({ required: true }) projectBoardInfo!: Project; + private readonly projectDataService = inject(ProjectDataService); isContextMenuOpen = signal(false); + projectBoardInfo = this.projectDataService.project(); + onMouseDown(event: MouseEvent, projectBoardInfo: Project): void { event.stopPropagation(); diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html index a27d30a9..ef01cee4 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html @@ -2,90 +2,88 @@
    - @if (isLeaderOrResponsibleOrPerformer) { @if (isTaskResult) { @if (isTaskResult.isVerified) { -
    - вы приняли работу - } @if (isLeaderAcceptResult) { - результат принят - } @if (isCommented) { - вы прокомментировали - } @else { - приемка - } - - результат задачи - } +
    + @if (!isTaskResult()) { @if (isExternal() || ((isLeader() || isCreator()) && !isPerformer() && + !isResponsible())) { + ожидание результата + } @else if (isResponsible() || isPerformer()) { + прикрепить результа + } } @else { @if (isCommented) { + {{ + isCommentedByLeader && !isLeader() ? "комментарий лидера" : "вы прокомментировали" + }} + } @if (isLeaderAcceptResult()) { @if (!(isExternal())) { +
    + } - ожидание результата - } @if (isPerformer || isResponsible) { @if (isTaskResult) { @if (isCommentedByLeader) { - комментарий лидера - } - ожидание проверки - } + {{ isLeader() ? "вы приняли работу" : "результат принят" }} + } @else { @if (isLeader() && !isLeaderLeaveComment()) { + приемка + } @if (!isCommentedByLeader) { @if (isResponsible() || isPerformer()) { + ожидание проверки + } } } - {{ isTaskResult ? "результат задачи" : "прикрепить результат" }} - } + результат задачи + } +
    - @if (taskDetailForm.get("action"); as action) { + @if (taskDetailForm.get("type"); as type) {
    - +
    @@ -107,8 +105,7 @@ [options]="priorityTypeOptions" >
    - } - + } @if (isCreator() || isLeader()) {
    + }
    @@ -427,7 +425,10 @@
    исполнители
    }
    } @if (skills.value.length < 3) { -
    +
    } @@ -516,6 +517,7 @@
    исполнители
    исполнители size="big" formControlName="text" [hasBorder]="false" + [autofocus]="isCommentedClick" [error]="text | controlError" class="form__input text-body-12" placeholder="добавить комментарий" @@ -590,11 +593,7 @@
    исполнители
    -
    +

    результат выполнения задачи

    @@ -665,16 +664,23 @@
    исполнители
    -
    +

    результат выполнения задачи

    @if (taskDetailInfo()?.result; as result) { -

    {{ result.description }}

    +

    {{ result.description }}

    -
    +
    @if (result.accompanyingFile; as file) { исполнители [type]="file.extension" [size]="file.size" > - } @if (isLeaderOrResponsibleOrPerformer) { + } @if (isPerformer() || isResponsible()) {
    @@ -696,7 +701,8 @@
    исполнители
    @@ -711,13 +717,18 @@
    исполнители

    принять выполнение задачи

    - +
    - принять + принять исполнители

    вы уверены, что хотите снять приемку работы?

    - + удалить результатисполнители вы уверены, что хотите удалить текущий результат работы

    - + отменить приемку работыисполнители [open]="showLeaderCommentedResultModal" (openChange)="showLeaderCommentedResultModal = false" > -
    -

    +

    +

    вы уверены, что исправили результат по комментариям от лидера?

    - + - комментарии решены + комментарии решены
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index fc084857..5d52db02 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -14,6 +14,7 @@ &-top { display: flex; + gap: 20px; align-items: center; justify-content: space-between; margin-bottom: 24px; @@ -23,6 +24,20 @@ gap: 10px; align-items: center; } + + &--accept { + width: 23px; + height: 23px; + border: 0.5px solid var(--accent); + border-radius: var(--rounded-md); + cursor: pointer; + } + } + + &-buttons { + display: flex; + gap: 12px; + align-items: center; } &-type, @@ -445,6 +460,7 @@ &__section { display: flex; justify-content: space-between; + width: 100%; margin-bottom: 8px; border-bottom: 0.5px solid var(--accent); } @@ -518,7 +534,7 @@ align-items: center; justify-content: center; max-height: calc(100vh - 40px); - padding: 30px 60px; + padding: 24px; overflow-y: auto; &__title { @@ -526,24 +542,27 @@ } &__text { - color: var(--grey-for-text); + color: var(--grey-for-text) !important; } &__buttons { display: flex; gap: 10px; align-items: center; - margin-top: 20px; } &__button { margin-top: 20px; } + &__icon { + margin: 36px 0; + } + &__footer { display: flex; align-items: center; - justify-content: space-between; + width: 100%; &-actions { display: flex; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts index a996132f..0200152d 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts @@ -8,14 +8,12 @@ import { ElementRef, EventEmitter, inject, - Input, OnDestroy, OnInit, Output, signal, ViewChild, } from "@angular/core"; -import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; import { InputComponent, ButtonComponent } from "@ui/components"; import { FileItemComponent } from "@ui/components/file-item/file-item.component"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; @@ -37,21 +35,18 @@ import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; import { priorityInfoList } from "projects/core/src/consts/lists/priority-info-list.const"; import { ClickOutsideModule } from "ng-click-outside"; import { actionTypeList } from "projects/core/src/consts/lists/actiion-type-list.const"; -import { Project } from "@office/models/project.model"; import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.component"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { SkillsService } from "@office/services/skills.service"; import { Skill } from "@office/models/skill"; -import { filter, map, Subscription, take } from "rxjs"; +import { map, Subscription } from "rxjs"; import { TaskDetail } from "../../../models/task.model"; import { daysUntil } from "@utils/days-untit"; -import { KanbanBoardService } from "../../../kanban-board.service"; +import { KanbanBoardService } from "../../../services/kanban-board.service"; import { getPriorityType } from "@utils/helpers/getPriorityType"; import { getActionType } from "@utils/helpers/getActionType"; import { ActivatedRoute } from "@angular/router"; import { FileService } from "@core/services/file.service"; -import { AuthService } from "@auth/services"; -import { User } from "@auth/models/user.model"; import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; import { ErrorMessage } from "@error/models/error-message"; import { SnackbarService } from "@ui/services/snackbar.service"; @@ -61,10 +56,10 @@ import { CdkVirtualForOf, CdkVirtualScrollViewport, } from "@angular/cdk/scrolling"; -import { ChatMessageComponent } from "@ui/components/chat-message/chat-message.component"; -import { CommentDto } from "../../../models/dto/comment.model.dto"; import { TagDto } from "../../../models/dto/tag.model.dto"; import { PerformerDto } from "../../../models/dto/performer.model.dto"; +import { KanbanBoardInfoService } from "../../../services/kanban-board-info.service"; +import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; @Component({ selector: "app-task-detail", @@ -73,7 +68,6 @@ import { PerformerDto } from "../../../models/dto/performer.model.dto"; imports: [ CommonModule, ReactiveFormsModule, - FileUploadItemComponent, InputComponent, IconComponent, FileItemComponent, @@ -95,14 +89,10 @@ import { PerformerDto } from "../../../models/dto/performer.model.dto"; CdkFixedSizeVirtualScroll, CdkVirtualScrollViewport, CdkVirtualForOf, - ChatMessageComponent, ], standalone: true, }) export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { - @Input() collaborators?: Project["collaborators"]; - @Input() goals?: Project["goals"]; - @Output() delete = new EventEmitter(); @ViewChild("descEl") descEl?: ElementRef; @@ -111,7 +101,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { private readonly skillsService = inject(SkillsService); private readonly kanbanBoardService = inject(KanbanBoardService); - private readonly authService = inject(AuthService); + private readonly kanbanBoardInfoService = inject(KanbanBoardInfoService); + private readonly projectDataService = inject(ProjectDataService); private readonly fileService = inject(FileService); private readonly snackbarService = inject(SnackbarService); private readonly validationService = inject(ValidationService); @@ -132,7 +123,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { files: [[]], priority: [null], status: [null], - action: [null], + type: [null], score: [null], tagsLib: [[]], }); @@ -148,8 +139,27 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { }); } - taskDetailInfo = signal(null); - currentUser = signal(null); + taskDetailForm: FormGroup; + + messageForm: FormGroup; + /** Сообщение, на которое отвечаем */ + replyMessage?: ChatMessage; + messages = signal([ + // { + // id: 1, + // text: "123", + // author: { + // id: 11, + // avatar: "https://api.selcdn.ru/v1/SEL_228194/procollab_media/5388035211510428528/2458680223122098610_2202079899633949339.webp", + // firstName: "Егоg", + // lastName: "Токареg", + // }, + // createdAt: new Date().toISOString(), + // isRead: false, + // replyTo: this.replyMessage?.id ?? null, + // files: [], + // } + ]); isChangeDescriptionText = signal(false); @@ -164,7 +174,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { errorMessage = ErrorMessage; descriptionExpandable!: boolean; // Флаг необходимости кнопки "подробнее" - readFullDescription = false; // Флаг показа всех вакансий + readFullDescription = false; // Флаг показа описания isActionTypeOpen = false; isPriorityTypeOpen = false; @@ -175,6 +185,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { isTagsPickOpen = false; isCommentedClick = false; + isCompletedTask = false; creatingTag = false; loadingFile = false; @@ -197,13 +208,6 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { openGroupIds = new Set(); openGroupIndex: number | null = null; - taskDetailForm: FormGroup; - - messageForm: FormGroup; - /** Сообщение, на которое отвечаем */ - replyMessage?: ChatMessage; - messages = signal([]); - /** Массив прикрепленных файлов с метаданными */ attachFiles: { name: string; @@ -221,6 +225,19 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { subscriptions: Subscription[] = []; + readonly taskDetailInfo = this.kanbanBoardInfoService.taskDetail; + readonly leaderId = this.kanbanBoardInfoService.leaderId; + readonly collaborators = this.projectDataService.collaborators; + readonly goals = this.projectDataService.goals; + readonly isLeaderLeaveComment = this.kanbanBoardInfoService.isLeaderLeaveComment; + readonly isLeader = this.kanbanBoardInfoService.isLeader; + readonly isPerformer = this.kanbanBoardInfoService.isPerformer; + readonly isResponsible = this.kanbanBoardInfoService.isResponsible; + readonly isCreator = this.kanbanBoardInfoService.isCreator; + readonly isExternal = this.kanbanBoardInfoService.isExternal; + readonly isTaskResult = this.kanbanBoardInfoService.isTaskResult; + readonly isLeaderAcceptResult = this.kanbanBoardInfoService.isLeaderAcceptResult; + get actionTypeOptions() { return actionTypeList; } @@ -237,8 +254,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { } get responsiblePickOpenOptions() { - return this.collaborators - ? this.collaborators.map(collaborator => ({ + return this.collaborators()?.length + ? this.collaborators()!.map(collaborator => ({ id: collaborator.userId, label: collaborator.firstName + " " + collaborator.lastName[0], value: collaborator.userId, @@ -248,8 +265,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { } get goalPickOptions() { - return this.goals - ? this.goals.map(goal => ({ + return this.goals()?.length + ? this.goals()!.map(goal => ({ id: goal.id, label: goal.title, value: goal.id, @@ -303,89 +320,19 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { }; } - get isPerformer() { - const user = this.currentUser(); - const taskDetail = this.taskDetailInfo(); - - if (!user || !taskDetail) return false; - - return taskDetail.performers.some(performer => performer.id === user.id); - } - - get isResponsible() { - const user = this.currentUser(); - const taskDetail = this.taskDetailInfo(); - - if (!user || !taskDetail) return false; - - return taskDetail.responsible.id === user.id; - } - - get isLeader() { - const taskDetail = this.taskDetailInfo(); - const user = this.currentUser(); - - if (!user || !taskDetail) return false; - - return taskDetail.creator.id === user.id; - } - - get isExternal() { - return !this.isLeader; - } - - get isLeaderOrResponsibleOrPerformer() { - return this.isLeader && (this.isResponsible || this.isPerformer); - } - - get isTaskResult() { - return this.taskDetailInfo()?.result; - } - - get isLeaderAcceptResult() { - const taskDetail = this.taskDetailInfo(); - - if (!taskDetail || !this.isTaskResult) return false; - - return this.isTaskResult.whoVerified.id === taskDetail.creator.id; - } - get isCommented() { - const comments = this.taskDetailForm.get("comments")?.value; - - if (!comments) return false; - - return !!comments.length; + return this.messages().length > 0 && this.isLeaderLeaveComment(); } get isCommentedByLeader() { - const comments = this.taskDetailForm.get("comments")?.value; - const taskDetail = this.taskDetailInfo(); - - if (!comments || !taskDetail) return false; - return ( - !this.isCommented && - comments.some((comment: CommentDto) => comment.id === taskDetail.creator.id) + this.messages().some((comments: ChatMessage) => comments.author.id === this.leaderId()) && + this.isLeaderLeaveComment() ); } ngOnInit(): void { - // this.taskDetailForm.valueChanges.subscribe({ - // next: value => { - // console.log(value); - // }, - // }); - - const profileSub$ = this.authService.profile.pipe(filter(profile => !!profile)).subscribe({ - next: profile => { - if (profile) { - this.currentUser.set(profile); - } - }, - }); - - this.subscriptions.push(profileSub$); + this.updateDescriptionState(); } /** @@ -393,10 +340,8 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { */ ngAfterViewInit(): void { const todayDate = new Date(); - const tomorrowDate = new Date(todayDate); - tomorrowDate.setDate(todayDate.getDate() + 1); - this.initializeTaskDetailInfo(todayDate, tomorrowDate); + this.initializeTaskDetailInfo(todayDate); this.checkDescriptionHeigth(); } @@ -472,99 +417,113 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { } onTypeSelect( - type: "action" | "priority" | "responsible" | "performers" | "goal" | "tags" | "delete", + type: "type" | "priority" | "responsible" | "performers" | "goal" | "tags" | "delete", state: boolean, typeId?: number ) { switch (type) { - case "action": - this.isActionTypeOpen = state; - this.taskDetailForm.patchValue({ action: typeId }); + case "type": + if (this.isLeader() || this.isCreator()) { + this.isActionTypeOpen = state; + this.taskDetailForm.patchValue({ action: typeId }); + } + break; case "priority": - this.isPriorityTypeOpen = state; - this.taskDetailForm.patchValue({ priority: typeId }); + if (this.isLeader() || this.isCreator()) { + this.isPriorityTypeOpen = state; + this.taskDetailForm.patchValue({ priority: typeId }); + } + break; case "responsible": { - this.isResponsiblePickOpen = state; - - if (typeId !== undefined) { - if (!this.collaborators) return; - - const responsible = this.collaborators.find( - collaborator => collaborator.userId === typeId - ); - this.taskDetailForm.patchValue({ - responsible: { - id: responsible?.userId, - avatar: responsible?.avatar, - name: responsible?.firstName + " " + responsible?.lastName[0], - }, - }); + if (this.isLeader() || this.isCreator()) { + this.isResponsiblePickOpen = state; + + if (typeId !== undefined) { + if (!this.collaborators()) return; + + const responsible = this.collaborators()?.find( + collaborator => collaborator.userId === typeId + ); + this.taskDetailForm.patchValue({ + responsible: { + id: responsible?.userId, + avatar: responsible?.avatar, + name: responsible?.firstName + " " + responsible?.lastName[0], + }, + }); + } } break; } case "performers": { - this.isPerformersPickOpen = state; - - if (typeId !== undefined) { - if (!this.collaborators) return; - - const collaborator = this.collaborators.find( - collaborator => collaborator.userId === typeId - ); - const currentPerformers: PerformerDto[] = - this.taskDetailForm.get("performers")?.value || []; - const payload = { - id: collaborator?.userId, - avatar: collaborator?.avatar, - name: collaborator?.firstName + " " + collaborator?.lastName[0], - }; - - if (currentPerformers.some((performer: PerformerDto) => performer.id === payload.id)) - return; - - this.taskDetailForm.patchValue({ - performers: [...currentPerformers, payload], - }); + if (this.isResponsible() || this.isLeader() || this.isCreator()) { + this.isPerformersPickOpen = state; + + if (typeId !== undefined) { + if (!this.collaborators()) return; + + const collaborator = this.collaborators()?.find( + collaborator => collaborator.userId === typeId + ); + const currentPerformers: PerformerDto[] = + this.taskDetailForm.get("performers")?.value || []; + const payload = { + id: collaborator?.userId, + avatar: collaborator?.avatar, + name: collaborator?.firstName + " " + collaborator?.lastName[0], + }; + + if (currentPerformers.some((performer: PerformerDto) => performer.id === payload.id)) + return; + + this.taskDetailForm.patchValue({ + performers: [...currentPerformers, payload], + }); + } } break; } case "goal": { - this.isGoalPickOpen = state; + if (this.isLeader() || this.isCreator()) { + this.isGoalPickOpen = state; - if (typeId !== undefined) { - if (!this.goals) return; + if (typeId !== undefined) { + if (!this.goals()) return; - const goal = this.goals.find(goal => goal.id === typeId); - if (goal) this.taskDetailForm.patchValue({ goal: { id: goal.id, title: goal.title } }); + const goal = this.goals()?.find(goal => goal.id === typeId); + if (goal) this.taskDetailForm.patchValue({ goal: { id: goal.id, title: goal.title } }); + } } break; } case "tags": { - this.isTagsPickOpen = state; - - if (!state) { - this.editingTag = null; - this.creatingTag = false; - } - - if (typeId !== undefined) { - const tag = this.tagsPickOptions.find((tag: TagDto) => tag.id === typeId); - const payload = { id: tag?.id, title: tag?.label, color: tag?.additionalInfo }; - - const currentTags = this.taskDetailForm.get("tags")?.value || []; - if (currentTags.some((tag: TagDto) => tag.id === payload.id)) return; - this.taskDetailForm.patchValue({ tags: [...currentTags, payload] }); - } else { - this.editingTag = null; - this.creatingTag = false; + if (this.isLeader() || this.isCreator()) { + this.isTagsPickOpen = state; + + if (!state) { + this.editingTag = null; + this.creatingTag = false; + } + + if (typeId !== undefined) { + const tag = this.tagsPickOptions.find((tag: TagDto) => tag.id === typeId); + const payload = { id: tag?.id, title: tag?.label, color: tag?.additionalInfo }; + + const currentTags = this.taskDetailForm.get("tags")?.value || []; + if (currentTags.some((tag: TagDto) => tag.id === payload.id)) return; + this.taskDetailForm.patchValue({ tags: [...currentTags, payload] }); + } else { + this.editingTag = null; + this.creatingTag = false; + } } break; @@ -572,9 +531,13 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { case "delete": if (typeId !== undefined) { - this.delete.emit(); + this.isDeleteTypeOpen = state; + + if (this.isCreator() || this.isLeader()) { + this.delete.emit(); + } } - this.isDeleteTypeOpen = state; + break; default: @@ -728,6 +691,9 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { // TODO: Отправка отклика на сервер // this.snackbarService.success("результат работы успешно прикреплен"); + + this.showAttachResultModal = false; + this.showResultModal = false; } /** @@ -741,7 +707,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { const newMessage = { id: Date.now(), text, - author: this.currentUser(), + author: this.kanbanBoardInfoService.currentUser(), createdAt: new Date().toISOString(), isRead: false, replyTo: this.replyMessage?.id ?? null, @@ -782,6 +748,16 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { this.replyMessage = undefined; } + private updateDescriptionState() { + const descriptionControl = this.taskDetailForm.get("description"); + + if (!(this.isLeader() || this.isCreator())) { + descriptionControl?.disable(); + } else { + descriptionControl?.enable(); + } + } + /** * Добавление навыка * @param newSkill - новый навык @@ -829,25 +805,37 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { this.cdRef.detectChanges(); } - private initializeTaskDetailInfo(todayDate: Date, tommorowDate: Date): void { + private initializeTaskDetailInfo(todayDate: Date): void { + const startDateDefault = new Date(todayDate); + startDateDefault.setDate(todayDate.getDate() + 1); + + const deadlineDefault = new Date(todayDate); + deadlineDefault.setDate(todayDate.getDate() + 2); + const taskId = this.route.snapshot.queryParams["taskId"]; + const taskDetailInfo$ = this.kanbanBoardService.getTaskById(taskId).subscribe({ next: (taskDetailInfo: TaskDetail) => { - this.taskDetailInfo.set(taskDetailInfo); + this.kanbanBoardInfoService.setTaskDetailInfo(taskDetailInfo); this.taskDetailForm.patchValue({ title: taskDetailInfo.title ?? "", + type: taskDetailInfo.type ?? 1, + priority: taskDetailInfo.priority ?? 1, responsible: taskDetailInfo.responsible ?? null, performers: taskDetailInfo.performers ?? [], - startDate: taskDetailInfo.dateTaskStart ?? todayDate, + startDate: taskDetailInfo.datetimeTaskStart ?? startDateDefault, deadline: taskDetailInfo.deadlineDate ? new Date(taskDetailInfo.deadlineDate) - : tommorowDate, + : deadlineDefault, tags: taskDetailInfo.tags ?? [], goal: taskDetailInfo.goal ?? null, skills: taskDetailInfo.requiredSkills ?? [], description: taskDetailInfo.description ?? null, files: taskDetailInfo.files ?? [], + score: taskDetailInfo.score ?? 1, + creator: taskDetailInfo.creator ?? this.kanbanBoardInfoService.currentUser(), + createdAt: taskDetailInfo.datetimeCreated ?? new Date(), }); if (taskDetailInfo.result) { @@ -859,9 +847,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { this.remainingDaysDeadline.set( daysUntil( - taskDetailInfo.deadlineDate - ? new Date(taskDetailInfo.deadlineDate) - : new Date(tommorowDate) + taskDetailInfo.deadlineDate ? new Date(taskDetailInfo.deadlineDate) : deadlineDefault ) ); }, diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html index d6897f5a..cb5e6e2f 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html @@ -6,7 +6,7 @@ @if (task.description) {

    {{ task.description }}

    } @if (task.responsible || (task.performers && task.performers.length > 0) || task.files || - task.action) { + task.type) {
    @if (task.responsible; as responsible) { @@ -23,7 +23,7 @@ } } }
    - @if (task.files || task.action) { + @if (task.files || task.type) {
    diff --git a/projects/social_platform/src/app/office/projects/detail/services/project-data.service.ts b/projects/social_platform/src/app/office/projects/detail/services/project-data.service.ts index 94bd854b..af8eeeb8 100644 --- a/projects/social_platform/src/app/office/projects/detail/services/project-data.service.ts +++ b/projects/social_platform/src/app/office/projects/detail/services/project-data.service.ts @@ -1,39 +1,21 @@ /** @format */ -import { Injectable } from "@angular/core"; +import { computed, Injectable, signal } from "@angular/core"; import { Project } from "@office/models/project.model"; -import { BehaviorSubject, filter, map } from "rxjs"; @Injectable({ providedIn: "root", }) export class ProjectDataService { - private projectSubject = new BehaviorSubject(undefined); - project$ = this.projectSubject.asObservable(); + project = signal(undefined); setProject(project: Project) { - this.projectSubject.next(project); + this.project.set(project); } - getTeam() { - return this.project$.pipe( - map(project => project?.collaborators), - filter(team => !!team) - ); - } - - getVacancies() { - return this.project$.pipe( - map(project => project?.vacancies), - filter(vacancies => !!vacancies) - ); - } - - getProjectLeaderId() { - return this.project$.pipe(map(project => project?.leader)); - } - - getProjectId() { - return this.project$.pipe(map(project => project?.id)); - } + collaborators = computed(() => this.project()?.collaborators); + vacancies = computed(() => this.project()?.vacancies); + leaderId = computed(() => this.project()?.leader); + projectId = computed(() => this.project()?.id); + goals = computed(() => this.project()?.goals); } diff --git a/projects/social_platform/src/app/office/projects/detail/team/team.component.html b/projects/social_platform/src/app/office/projects/detail/team/team.component.html index 63e2fc80..04d3254f 100644 --- a/projects/social_platform/src/app/office/projects/detail/team/team.component.html +++ b/projects/social_platform/src/app/office/projects/detail/team/team.component.html @@ -1,8 +1,8 @@ -@if(team) { @if (team.length) { +@if(collaborators()) { @if (collaborators()?.length) {
    - @for (collaborator of team; track $index) { + @for (collaborator of collaborators(); track $index) { (0); + readonly collaborators = this.projectDataService.collaborators; + readonly projectId = this.projectDataService.projectId; loggedUserId = signal(0); - leaderId = signal(0); + readonly leaderId = this.projectDataService.leaderId; // массив подписок subscriptions: Subscription[] = []; ngOnInit(): void { - // получение данных из сервиса как потока данных и подписка на них - const teamSub$ = this.projectDataService.getTeam().subscribe({ - next: team => { - this.team = team; - }, - }); - - teamSub$ && this.subscriptions.push(teamSub$); - - const projectId$ = this.projectDataService.getProjectId().subscribe({ - next: projectId => { - if (projectId) { - this.projectId.set(projectId); - } - }, - }); - if (location.href.includes("/team")) { - const leaderId$ = this.projectDataService.getProjectLeaderId().subscribe({ - next: leaderId => { - if (leaderId) { - this.leaderId.set(leaderId); - } - }, - }); - - const currentProfileId$ = this.authService.profile.subscribe({ - next: profile => { - if (profile) { - this.loggedUserId.set(profile.id); - } - }, - }); + const currentProfileId$ = this.authService.profile + .pipe( + filter(profile => !!profile), + map(profile => profile.id) + ) + .subscribe({ + next: profileId => { + if (profileId) { + this.loggedUserId.set(profileId); + } + }, + }); - this.subscriptions.push(leaderId$, currentProfileId$); + this.subscriptions.push(currentProfileId$); } - - this.subscriptions.push(projectId$); } ngOnDestroy(): void { @@ -80,11 +57,16 @@ export class ProjectTeamComponent implements OnInit, OnDestroy { } removeCollaboratorFromProject(userId: number): void { - const index = this.team?.findIndex(p => p.userId === userId); - if (index !== -1) { - this.team?.splice(index!, 1); - } + if (!this.collaborators()) return; - this.projectService.removeColloborator(this.projectId(), userId).subscribe(); + this.projectService.removeColloborator(this.projectId()!, userId).subscribe({ + next: () => { + const updatedProject = { + ...this.projectDataService.project()!, + collaborators: this.collaborators()?.filter(c => c.userId !== userId) ?? [], + }; + this.projectDataService.setProject(updatedProject); + }, + }); } } diff --git a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.html b/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.html index dcdecd2f..efa4bf09 100644 --- a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.html +++ b/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.html @@ -1,8 +1,8 @@ -@if (vacancies) { @if (vacancies.length) { +@if (vacancies()) { @if (vacancies()?.length) {
      - @for (vacancy of vacancies; track vacancy.id) { + @for (vacancy of vacancies(); track vacancy.id) {
      • diff --git a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.ts b/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.ts index 548c0f67..cc648e19 100644 --- a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.ts @@ -23,20 +23,12 @@ export class ProjectVacanciesComponent implements OnInit, OnDestroy { private readonly projectDataService = inject(ProjectDataService); // массив пользователей в команде - vacancies?: Project["vacancies"]; + vacancies = this.projectDataService.vacancies; // массив подписок subscriptions: Subscription[] = []; - ngOnInit(): void { - const vacanciesSub$ = this.projectDataService.getVacancies().subscribe({ - next: vacancies => { - this.vacancies = vacancies; - }, - }); - - vacanciesSub$ && this.subscriptions.push(vacanciesSub$); - } + ngOnInit(): void {} ngOnDestroy(): void { this.subscriptions.forEach($ => $.unsubscribe()); diff --git a/projects/social_platform/src/app/office/projects/edit/edit.component.ts b/projects/social_platform/src/app/office/projects/edit/edit.component.ts index 7c642770..40e91a53 100644 --- a/projects/social_platform/src/app/office/projects/edit/edit.component.ts +++ b/projects/social_platform/src/app/office/projects/edit/edit.component.ts @@ -47,10 +47,10 @@ import { ProjectTeamService } from "./services/project-team.service"; import { ProjectAdditionalStepComponent } from "./shared/project-additional-step/project-additional-step.component"; import { ProjectAdditionalService } from "./services/project-additional.service"; import { ProjectAchievementsService } from "./services/project-achievements.service"; -import { Goal, GoalPostForm } from "@office/models/goals.model"; +import { Goal } from "@office/models/goals.model"; import { ProjectGoalService } from "./services/project-goals.service"; import { SnackbarService } from "@ui/services/snackbar.service"; -import { Resource, ResourcePostForm } from "@office/models/resource.model"; +import { Resource } from "@office/models/resource.model"; import { Partner } from "@office/models/partner.model"; import { ProjectPartnerService } from "./services/project-partner.service"; import { ProjectResourceService } from "./services/project-resources.service"; diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-goals.service.ts b/projects/social_platform/src/app/office/projects/edit/services/project-goals.service.ts index 9aff1cc9..14512b54 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-goals.service.ts +++ b/projects/social_platform/src/app/office/projects/edit/services/project-goals.service.ts @@ -3,7 +3,7 @@ import { inject, Injectable, signal } from "@angular/core"; import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; import { ProjectFormService } from "./project-form.service"; -import { Goal, GoalPostForm } from "@office/models/goals.model"; +import { Goal, GoalDto } from "@office/models/goals.model"; import { catchError, forkJoin, map, of, tap } from "rxjs"; import { ProjectService } from "@office/services/project.service"; @@ -312,7 +312,7 @@ export class ProjectGoalService { public editGoals(projectId: number, existingGoals: Goal[]) { const requests = existingGoals.map((item, idx) => { - const payload: GoalPostForm = { + const payload: GoalDto = { id: item.id, title: item.title, completionDate: item.completionDate, diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-partner.service.ts b/projects/social_platform/src/app/office/projects/edit/services/project-partner.service.ts index d94183e5..93cfea2e 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-partner.service.ts +++ b/projects/social_platform/src/app/office/projects/edit/services/project-partner.service.ts @@ -2,7 +2,7 @@ import { inject, Injectable, signal } from "@angular/core"; import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; -import { Partner, PartnerPostForm } from "@office/models/partner.model"; +import { Partner, PartnerDto } from "@office/models/partner.model"; import { ProjectService } from "@office/services/project.service"; import { catchError, forkJoin, map, Observable, of, tap } from "rxjs"; @@ -222,7 +222,7 @@ export class ProjectPartnerService { const requests = partners.map(partner => { const decisionMaker = Number(partner.decisionMaker.split("/").at(-1)); - const payload: PartnerPostForm = { + const payload: PartnerDto = { name: partner.name, inn: partner.inn, contribution: partner.contribution, diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts b/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts index cc9e17c9..319e6671 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts +++ b/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts @@ -2,9 +2,9 @@ import { inject, Injectable, signal } from "@angular/core"; import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; -import { Resource, ResourcePostForm } from "@office/models/resource.model"; +import { Resource, ResourceDto } from "@office/models/resource.model"; import { ProjectService } from "@office/services/project.service"; -import { catchError, forkJoin, map, Observable, of, tap } from "rxjs"; +import { catchError, forkJoin, map, of, tap } from "rxjs"; @Injectable({ providedIn: "root", @@ -195,7 +195,7 @@ export class ProjectResourceService { const resources = this.getResourcesData(); const requests = resources.map(resource => { - const payload: Omit = { + const payload: Omit = { type: resource.type, description: resource.description, partnerCompany: resource.partnerCompany ?? "запрос к рынку", @@ -235,7 +235,7 @@ export class ProjectResourceService { const resources = this.getResourcesData(); const requests = resources.map(resource => { - const payload: Omit = { + const payload: Omit = { type: resource.type, description: resource.description, partnerCompany: resource.partnerCompany ?? "запрос к рынку", diff --git a/projects/social_platform/src/app/office/services/project.service.ts b/projects/social_platform/src/app/office/services/project.service.ts index b99c0444..27b867ba 100644 --- a/projects/social_platform/src/app/office/services/project.service.ts +++ b/projects/social_platform/src/app/office/services/project.service.ts @@ -10,9 +10,9 @@ import { ApiPagination } from "@models/api-pagination.model"; import { Collaborator } from "@office/models/collaborator.model"; import { ProjectAssign } from "@office/projects/models/project-assign.model"; import { projectNewAdditionalProgramVields } from "@office/models/partner-program-fields.model"; -import { Goal, GoalPostForm } from "@office/models/goals.model"; -import { Partner, PartnerPostForm } from "@office/models/partner.model"; -import { Resource, ResourcePostForm } from "@office/models/resource.model"; +import { Goal, GoalDto } from "@office/models/goals.model"; +import { Partner, PartnerDto } from "@office/models/partner.model"; +import { Resource, ResourceDto } from "@office/models/resource.model"; /** * Сервис для управления проектами @@ -80,7 +80,7 @@ export class ProjectService { * Если компания с таким ИНН уже существует — создаёт или обновляет связь ProjectCompany. * Если компании нет — создаёт новую и тут же привязывает. */ - addPartner(projectId: number, params: PartnerPostForm) { + addPartner(projectId: number, params: PartnerDto) { return this.apiService.post(`${this.PROJECTS_URL}/${projectId}/companies/`, params); } @@ -108,7 +108,7 @@ export class ProjectService { editParter( projectId: number, companyId: number, - params: Pick + params: Pick ) { return this.apiService.patch( `${this.PROJECTS_URL}/${projectId}/companies/${companyId}/`, @@ -133,7 +133,7 @@ export class ProjectService { * @returns Создать новый ресурс в проекте. * Если partner_company указана, проверяется, что она действительно является партнёром данного проекта. */ - addResource(projectId: number, params: Omit) { + addResource(projectId: number, params: Omit) { return this.apiService.post(`${this.PROJECTS_URL}/${projectId}/resources/`, { project_id: projectId, ...params, @@ -157,7 +157,7 @@ export class ProjectService { * @returns Полностью обновить данные ресурса. * Используется, если нужно заменить все поля сразу. */ - editResource(projectId: number, resourceId: number, params: Omit) { + editResource(projectId: number, resourceId: number, params: Omit) { return this.apiService.patch(`${this.PROJECTS_URL}/${projectId}/resources/${resourceId}/`, { project_id: projectId, ...params, @@ -187,14 +187,14 @@ export class ProjectService { /** * Отправляем цель */ - addGoals(projectId: number, params: GoalPostForm[]) { - return this.apiService.post(`${this.PROJECTS_URL}/${projectId}/goals/`, params); + addGoals(projectId: number, params: GoalDto[]) { + return this.apiService.post(`${this.PROJECTS_URL}/${projectId}/goals/`, params); } /** * Редактирование цели */ - editGoal(projectId: number, goalId: number, params: GoalPostForm) { + editGoal(projectId: number, goalId: number, params: GoalDto) { return this.apiService.put(`${this.PROJECTS_URL}/${projectId}/goals/${goalId}`, params); } @@ -202,9 +202,7 @@ export class ProjectService { * Удаляем цель */ deleteGoals(projectId: number, goalId: number) { - return this.apiService.delete( - `${this.PROJECTS_URL}/${projectId}/goals/${goalId}` - ); + return this.apiService.delete(`${this.PROJECTS_URL}/${projectId}/goals/${goalId}`); } /** diff --git a/projects/social_platform/src/app/ui/components/button/button.component.scss b/projects/social_platform/src/app/ui/components/button/button.component.scss index 929a27a7..ef99e886 100644 --- a/projects/social_platform/src/app/ui/components/button/button.component.scss +++ b/projects/social_platform/src/app/ui/components/button/button.component.scss @@ -105,6 +105,11 @@ border: 0.5px solid var(--white); } + &.button--green { + color: var(--green); + border: 0.5px solid var(--green); + } + &.button--no-border { border: none; } diff --git a/projects/social_platform/src/app/utils/helpers/isExist.ts b/projects/social_platform/src/app/utils/helpers/isExist.ts new file mode 100644 index 00000000..f69cb687 --- /dev/null +++ b/projects/social_platform/src/app/utils/helpers/isExist.ts @@ -0,0 +1,5 @@ +/** @format */ + +export const isExist = (value: T | null | undefined): value is T => { + return value !== null && value !== undefined; +}; From 6292b79d15bfd54b67c7d794cef7cf66ff931ff3 Mon Sep 17 00:00:00 2001 From: Awakich Date: Sun, 30 Nov 2025 16:28:54 +0300 Subject: [PATCH 16/22] add styles for task-detail for accept task --- .../kanban-board/shared/task/detail/task-detail.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss index 5d52db02..d4a1e1ec 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss @@ -28,9 +28,9 @@ &--accept { width: 23px; height: 23px; + cursor: pointer; border: 0.5px solid var(--accent); border-radius: var(--rounded-md); - cursor: pointer; } } From eb656f3a8d4fbc52c65fa2880690f1a600b6617c Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 2 Dec 2025 18:34:45 +0300 Subject: [PATCH 17/22] add sidebar info & creating for for board, services for board, task-detail-info, archive page --- .../src/consts/other/kanban-icons.const.ts | 19 +++ .../src/consts/other/quick-answers.const.ts | 24 ++++ .../tag-colors.const.ts} | 2 +- .../trajectory-more.const.ts} | 2 +- .../shared/trajectory/trajectory.component.ts | 2 +- .../features/detail/detail.component.ts | 2 +- .../src/app/office/models/tag.model.ts | 12 +- .../office/projects/detail/detail.routes.ts | 11 +- .../kanban-board/kanban-board.component.html | 117 --------------- .../detail/kanban-board/models/board.model.ts | 6 - .../actions/kanban-board-actions.component.ts | 18 --- .../kanban-board-sidebar.component.html | 25 ---- .../kanban-board-sidebar.component.scss | 16 --- .../sidebar/kanban-board-sidebar.component.ts | 64 --------- .../shared/task/kanban-task.component.html | 55 ------- .../shared/task/kanban-task.component.ts | 23 --- .../archive/kanban-archive.component.html | 15 ++ .../archive/kanban-archive.component.scss | 8 ++ .../archive/kanban-archive.component.ts | 101 +++++++++++++ .../kanban/board/kanban-board.component.html | 104 ++++++++++++++ .../board}/kanban-board.component.scss | 7 - .../board}/kanban-board.component.ts | 82 ++++------- .../detail/kanban/kanban.component.html | 15 ++ .../detail/kanban/kanban.component.scss | 17 +++ .../detail/kanban/kanban.component.ts | 46 ++++++ .../kanban.guard.ts} | 0 .../kanban.resolver.ts} | 0 .../projects/detail/kanban/kanban.routes.ts | 17 +++ .../detail/kanban/models/board.model.ts | 34 +++++ .../models/column.model.ts | 0 .../models/comments.model.ts | 0 .../models/dto/comment.model.dto.ts | 0 .../models/dto/performer.model.dto.ts | 0 .../models/dto/tag.model.dto.ts | 0 .../models/task.model.ts | 1 + .../kanban-board-detail-info.service.ts} | 66 ++++++++- .../services/kanban-board-info.service.ts | 58 ++++++++ .../services/kanban-board.service.ts | 0 .../kanban-board-actions.component.html | 2 +- .../kanban-board-actions.component.scss | 0 .../actions/kanban-board-actions.component.ts | 25 ++++ .../cancel-task-form.component.html | 48 +++++++ .../cancel-task-form.component.scss | 32 +++++ .../cancel-task-form.component.ts | 61 ++++++++ .../create-board-form.component.html | 60 ++++++++ .../create-board-form.component.scss | 87 ++++++++++++ .../create-board-form.component.ts | 62 ++++++++ .../create-tag-form.component.html | 0 .../create-tag-form.component.scss | 0 .../create-tag-form.component.ts | 12 +- .../kanban-board-sidebar.component.html | 45 ++++++ .../kanban-board-sidebar.component.scss | 54 +++++++ .../sidebar/kanban-board-sidebar.component.ts | 134 ++++++++++++++++++ .../task/detail/task-detail.component.html | 0 .../task/detail/task-detail.component.scss | 0 .../task/detail/task-detail.component.ts | 49 ++++--- .../shared/task/kanban-task.component.html | 86 +++++++++++ .../shared/task/kanban-task.component.scss | 64 ++++++++- .../shared/task/kanban-task.component.ts | 49 +++++++ .../work-section/work-section.component.html | 2 +- .../components/dropdown/dropdown.component.ts | 4 +- .../app/ui/components/tag/tag.component.html | 3 + .../app/ui/components/tag/tag.component.scss | 18 +++ .../app/ui/components/tag/tag.component.ts | 10 +- .../src/assets/icons/svg/command.svg | 3 + .../src/assets/icons/svg/deadline.svg | 2 +- .../src/assets/icons/svg/person.svg | 2 +- .../assets/icons/symbol/svg/sprite.css.svg | 2 +- 68 files changed, 1445 insertions(+), 440 deletions(-) create mode 100644 projects/core/src/consts/other/kanban-icons.const.ts create mode 100644 projects/core/src/consts/other/quick-answers.const.ts rename projects/core/src/consts/{lists/tag-colots.list.const.ts => other/tag-colors.const.ts} (94%) rename projects/core/src/consts/{lists/trajectory-more-list.const.ts => other/trajectory-more.const.ts} (88%) delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html delete mode 100644 projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.html rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban/board}/kanban-board.component.scss (94%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban/board}/kanban-board.component.ts (79%) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts rename projects/social_platform/src/app/office/projects/detail/{kanban-board/kanban-board.guard.ts => kanban/kanban.guard.ts} (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board/kanban-board.resolver.ts => kanban/kanban.resolver.ts} (100%) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/models/board.model.ts rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/models/column.model.ts (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/models/comments.model.ts (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/models/dto/comment.model.dto.ts (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/models/dto/performer.model.dto.ts (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/models/dto/tag.model.dto.ts (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/models/task.model.ts (97%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board/services/kanban-board-info.service.ts => kanban/services/kanban-board-detail-info.service.ts} (67%) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-info.service.ts rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/services/kanban-board.service.ts (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/actions/kanban-board-actions.component.html (94%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/actions/kanban-board-actions.component.scss (100%) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.ts create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.ts rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/create-tag-form/create-tag-form.component.html (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/create-tag-form/create-tag-form.component.scss (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/create-tag-form/create-tag-form.component.ts (87%) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.html create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.scss create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.ts rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/task/detail/task-detail.component.html (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/task/detail/task-detail.component.scss (100%) rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/task/detail/task-detail.component.ts (93%) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.html rename projects/social_platform/src/app/office/projects/detail/{kanban-board => kanban}/shared/task/kanban-task.component.scss (61%) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.ts create mode 100644 projects/social_platform/src/assets/icons/svg/command.svg diff --git a/projects/core/src/consts/other/kanban-icons.const.ts b/projects/core/src/consts/other/kanban-icons.const.ts new file mode 100644 index 00000000..428ecfb0 --- /dev/null +++ b/projects/core/src/consts/other/kanban-icons.const.ts @@ -0,0 +1,19 @@ +/** @format */ + +export const KanbanIcons = [ + { id: 0, name: "task", value: "task" }, + { id: 1, name: "key", value: "key" }, + { id: 2, name: "command", value: "command" }, + { id: 3, name: "anchor", value: "anchor" }, + { id: 4, name: "in-search", value: "in-search" }, + { id: 5, name: "suitcase", value: "suitcase" }, + { id: 6, name: "person", value: "person" }, + { id: 7, name: "deadline", value: "deadline" }, + { id: 8, name: "main", value: "main" }, + { id: 9, name: "attach", value: "attach" }, + { id: 10, name: "send", value: "send" }, + { id: 11, name: "contacts", value: "contacts" }, + { id: 12, name: "graph", value: "graph" }, + { id: 13, name: "phone", value: "phone" }, + { id: 14, name: "people-bold", value: "people-bold" }, +]; diff --git a/projects/core/src/consts/other/quick-answers.const.ts b/projects/core/src/consts/other/quick-answers.const.ts new file mode 100644 index 00000000..6416df81 --- /dev/null +++ b/projects/core/src/consts/other/quick-answers.const.ts @@ -0,0 +1,24 @@ +/** @format */ + +export const QuickAnswers = [ + { + id: 1, + title: "у работы нет результата", + }, + { + id: 2, + title: "задача была нереальной", + }, + { + id: 3, + title: "нет ссылок", + }, + { + id: 4, + title: "результат плохо выполнен", + }, + { + id: 5, + title: "результат требует доработок", + }, +]; diff --git a/projects/core/src/consts/lists/tag-colots.list.const.ts b/projects/core/src/consts/other/tag-colors.const.ts similarity index 94% rename from projects/core/src/consts/lists/tag-colots.list.const.ts rename to projects/core/src/consts/other/tag-colors.const.ts index c436a245..00d37c30 100644 --- a/projects/core/src/consts/lists/tag-colots.list.const.ts +++ b/projects/core/src/consts/other/tag-colors.const.ts @@ -1,6 +1,6 @@ /** @format */ -export const tagColorsList = [ +export const tagColors = [ { id: 1, name: "accent", diff --git a/projects/core/src/consts/lists/trajectory-more-list.const.ts b/projects/core/src/consts/other/trajectory-more.const.ts similarity index 88% rename from projects/core/src/consts/lists/trajectory-more-list.const.ts rename to projects/core/src/consts/other/trajectory-more.const.ts index 7a8861cb..63f222cf 100644 --- a/projects/core/src/consts/lists/trajectory-more-list.const.ts +++ b/projects/core/src/consts/other/trajectory-more.const.ts @@ -1,6 +1,6 @@ /** @format */ -export const trajectoryMoreList = [ +export const trajectoryMore = [ { label: "Работа с наставником", }, diff --git a/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts b/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts index e3162574..5c2b5f67 100644 --- a/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts +++ b/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts @@ -24,7 +24,7 @@ import { Trajectory } from "projects/skills/src/models/trajectory.model"; import { HttpErrorResponse } from "@angular/common/http"; import { BreakpointObserver } from "@angular/cdk/layout"; import { map, Observable } from "rxjs"; -import { trajectoryMoreList } from "projects/core/src/consts/lists/trajectory-more-list.const"; +import { trajectoryMoreList } from "projects/core/src/consts/other/trajectory-more.const"; /** * Компонент отображения карточки траектории diff --git a/projects/social_platform/src/app/office/features/detail/detail.component.ts b/projects/social_platform/src/app/office/features/detail/detail.component.ts index 1b17894b..51ccbfda 100644 --- a/projects/social_platform/src/app/office/features/detail/detail.component.ts +++ b/projects/social_platform/src/app/office/features/detail/detail.component.ts @@ -426,7 +426,7 @@ export class DeatilComponent implements OnInit, OnDestroy { this.isProjectWorkSectionPage = currentUrl.includes("/work-section"); this.isGantDiagramPage = currentUrl.includes("/gant-diagram"); - this.isKanbanBoardPage = currentUrl.includes("/kanban-board"); + this.isKanbanBoardPage = currentUrl.includes("/kanban"); } private initializeInfo() { diff --git a/projects/social_platform/src/app/office/models/tag.model.ts b/projects/social_platform/src/app/office/models/tag.model.ts index 074bbf5f..6e243daa 100644 --- a/projects/social_platform/src/app/office/models/tag.model.ts +++ b/projects/social_platform/src/app/office/models/tag.model.ts @@ -3,5 +3,15 @@ export class Tag { id!: number; name!: string; - color!: string; + color!: + | "primary" + | "secondary" + | "accent" + | "accent-medium" + | "blue-dark" + | "cyan" + | "red" + | "complete" + | "complete-dark" + | "soft"; } diff --git a/projects/social_platform/src/app/office/projects/detail/detail.routes.ts b/projects/social_platform/src/app/office/projects/detail/detail.routes.ts index 1e458462..d211c2ec 100644 --- a/projects/social_platform/src/app/office/projects/detail/detail.routes.ts +++ b/projects/social_platform/src/app/office/projects/detail/detail.routes.ts @@ -13,9 +13,9 @@ import { ProjectTeamComponent } from "./team/team.component"; import { ProjectVacanciesComponent } from "./vacancies/vacancies.component"; import { DeatilComponent } from "@office/features/detail/detail.component"; import { ProjectWorkSectionComponent } from "./work-section/work-section.component"; -import { KanbanBoardResolver } from "./kanban-board/kanban-board.resolver"; -import { KanbanBoardComponent } from "./kanban-board/kanban-board.component"; -import { KanbanBoardGuard } from "./kanban-board/kanban-board.guard"; +import { KanbanBoardResolver } from "./kanban/kanban.resolver"; +import { KanbanBoardGuard } from "./kanban/kanban.guard"; +import { KanbanComponent } from "./kanban/kanban.component"; /** * Конфигурация маршрутов для детального просмотра проекта @@ -70,12 +70,13 @@ export const PROJECT_DETAIL_ROUTES: Routes = [ }, }, { - path: "kanban-board", + path: "kanban", canActivate: [KanbanBoardGuard], - component: KanbanBoardComponent, + component: KanbanComponent, resolve: { data: KanbanBoardResolver, }, + loadChildren: () => import("./kanban/kanban.routes").then(c => c.KANBAN_ROUTES), }, { path: "chat", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html deleted file mode 100644 index 7c8c589b..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.html +++ /dev/null @@ -1,117 +0,0 @@ - - -
      -
      - -
      - @for (boardColumn of boardColumns(); track $index) { -
      - @if (selectedColumnId === boardColumn.id && editColumn) { @if (taskForm.get("columnTitle"); - as columnTitle) { - - - } } @else { -
      -

      {{ boardColumn.tasks.length }}

      -
      - @if (boardColumn.locked) { - - } @if (!(selectedColumnId === boardColumn.id && editColumn)) { -

      {{ boardColumn.name }}

      - } -
      - -
      - - - @if (isColumnInfoOpen && (selectedColumnId === boardColumn.id)) { - - } -
      -
      - } - -
      - @for (task of boardColumn.tasks; track task.id) { - - } @if (addTaskClick) { @if (selectedColumnId === boardColumn.id) { @if - (taskForm.get("taskTitle"); as taskTitle) { -
      - -
      - } } } -
      - - @if (isLeader || isExternal) { - - } -
      - } - -
      -
      - -
      -
      -
      - - @if (isTaskDetailOpen()) { - - } -
      -
      diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts deleted file mode 100644 index 0de6d350..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/board.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** @format */ - -export interface Board { - id: number; - name: string; -} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts deleted file mode 100644 index 6a507c8a..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -/** @format */ - -import { CommonModule } from "@angular/common"; -import { Component, inject } from "@angular/core"; -import { IconComponent } from "@uilib"; -import { KanbanBoardInfoService } from "../../services/kanban-board-info.service"; - -@Component({ - selector: "app-kanban-board-actions", - templateUrl: "./kanban-board-actions.component.html", - styleUrl: "./kanban-board-actions.component.scss", - imports: [CommonModule, IconComponent], - standalone: true, -}) -export class KanbanBoardActionsComponent { - private readonly kanbanBoardInfoService = inject(KanbanBoardInfoService); - readonly isLeader = this.kanbanBoardInfoService.isLeader; -} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html deleted file mode 100644 index 8a82eba8..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
      - @if (projectBoardInfo) { -
      -
      - -
      - - -
      - } - - -
      diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss deleted file mode 100644 index 93bd6b89..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.scss +++ /dev/null @@ -1,16 +0,0 @@ -.kanban { - &__sidebar { - position: relative; - display: flex; - flex-direction: column; - gap: 15px; - align-items: center; - justify-content: flex-start; - height: 60vh; - max-height: 373px; - padding: 15px; - background-color: var(--light-white); - border: 0.5px solid var(--medium-grey-for-outline); - border-radius: var(--rounded-lg); - } -} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts deleted file mode 100644 index 803d1cc7..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/sidebar/kanban-board-sidebar.component.ts +++ /dev/null @@ -1,64 +0,0 @@ -/** @format */ - -import { CommonModule } from "@angular/common"; -import { Component, inject, Input, signal } from "@angular/core"; -import { Project } from "@office/models/project.model"; -import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { KanbanBoardActionsComponent } from "../actions/kanban-board-actions.component"; -import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; -import { ClickOutsideModule } from "ng-click-outside"; -import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; - -@Component({ - selector: "app-kanban-board-sidebar", - templateUrl: "./kanban-board-sidebar.component.html", - styleUrl: "./kanban-board-sidebar.component.scss", - imports: [ - CommonModule, - AvatarComponent, - KanbanBoardActionsComponent, - DropdownComponent, - ClickOutsideModule, - ], - standalone: true, -}) -export class KanbanBoardSidebarComponent { - private readonly projectDataService = inject(ProjectDataService); - - isContextMenuOpen = signal(false); - - projectBoardInfo = this.projectDataService.project(); - - onMouseDown(event: MouseEvent, projectBoardInfo: Project): void { - event.stopPropagation(); - - if (event.button === 2 || event.ctrlKey) { - event.preventDefault(); - this.isContextMenuOpen.set(true); - return; - } - - if (event.button === 0) { - this.navigateToDifferentBoard(projectBoardInfo); - } - } - - private navigateToDifferentBoard(projectBoardInfo: Project): void { - console.log(projectBoardInfo.id); - } - - get contextMenuOptions() { - return [ - { - id: 1, - label: "выгрузить", - value: "", - }, - { - id: 2, - label: "архив выполнено", - value: "", - }, - ]; - } -} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html deleted file mode 100644 index cb5e6e2f..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.html +++ /dev/null @@ -1,55 +0,0 @@ - - -
      -
      - {{ task.title }} - @if (task.description) { -

      {{ task.description }}

      - } @if (task.responsible || (task.performers && task.performers.length > 0) || task.files || - task.type) { -
      -
      - @if (task.responsible; as responsible) { -
      - - -
      - } @if (task.performers; as performers) { @if (performers.length > 0) { @for (performer of - performers; track $index) { -
      - - -
      - } } } -
      - - @if (task.files || task.type) { -
      - - -
      - } -
      - } @if (task.deadlineDate || task.tags || task.goal) { -
      - @if (task.deadlineDate) { -
      - -

      04.04.2026

      -
      - } @if (task.tags[0]; as tag) { - {{ "#" + tag.name }} - } @if (task.goal; as goal) { - {{ goal.title }} - } -
      - } -
      - -
      - @if (task.priority) { -
      - } - -
      -
      diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts deleted file mode 100644 index 587e0fc1..00000000 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** @format */ - -import { CommonModule } from "@angular/common"; -import { Component, Input } from "@angular/core"; -import { IconComponent } from "@uilib"; -import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { TagComponent } from "@ui/components/tag/tag.component"; -import { RouterModule } from "@angular/router"; -import { getPriorityType } from "@utils/helpers/getPriorityType"; -import { TaskPreview } from "../../models/task.model"; - -@Component({ - selector: "app-kanban-task", - templateUrl: "./kanban-task.component.html", - styleUrl: "./kanban-task.component.scss", - imports: [CommonModule, RouterModule, IconComponent, AvatarComponent, TagComponent], - standalone: true, -}) -export class KanbanTaskComponent { - @Input({ required: true }) task!: TaskPreview; - - getPriorityType = getPriorityType; -} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.html new file mode 100644 index 00000000..6786f7d8 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.html @@ -0,0 +1,15 @@ + + +
      +
      +
      + +
      +
      + +
      + @for(task of completedTasks(); track task.id) { + + } +
      +
      diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.scss new file mode 100644 index 00000000..7d4e58f0 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.scss @@ -0,0 +1,8 @@ +.kanban { + &__tasks { + display: grid; + grid-template-columns: 3fr 3fr 3fr; + grid-gap: 20px; + margin-top: 20px; + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.ts new file mode 100644 index 00000000..b64b7c02 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.ts @@ -0,0 +1,101 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; +import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; +import { SearchComponent } from "@ui/components/search/search.component"; +import { Subscription } from "rxjs"; +import { KanbanBoardDetailInfoService } from "../services/kanban-board-detail-info.service"; +import { TaskPreview } from "../models/task.model"; +import { ActivatedRoute } from "@angular/router"; +import { KanbanTaskComponent } from "../shared/task/kanban-task.component"; + +@Component({ + selector: "app-kanban-archive", + templateUrl: "./kanban-archive.component.html", + styleUrl: "./kanban-archive.component.scss", + imports: [CommonModule, SearchComponent, ReactiveFormsModule, KanbanTaskComponent], + standalone: true, +}) +export class KanbanArhiveComponent implements OnInit, OnDestroy { + private readonly fb = inject(FormBuilder); + private readonly route = inject(ActivatedRoute); + private readonly kanbanBoardDetailInfoService = inject(KanbanBoardDetailInfoService); + + completedTasks = signal([]); + isTaskDetailOpen = signal(false); + + constructor() { + this.searchForm = this.fb.group({ + search: [""], + }); + } + + searchForm: FormGroup; + + subscriptions: Subscription[] = []; + + ngOnInit(): void { + const detailInfoUrl$ = this.kanbanBoardDetailInfoService.route.queryParams.subscribe(params => { + this.isTaskDetailOpen.set(!!params["taskId"]); + }); + + this.subscriptions.push(detailInfoUrl$); + + const completedTasks$ = this.route.data.subscribe({ + next: tasks => { + this.completedTasks.set(tasks as TaskPreview[]); + }, + }); + + this.subscriptions.push(completedTasks$); + + const mockCompleteTasks = [ + { + id: 11, + title: "123", + description: + "Сейчас, чтобы создался аккаунт внтури скиллз, пользователю обязательно надо войти внутрь вкладки траектории и еще раз залогиниться...", + priority: 5, + type: 2, + responsible: { + id: 12, + avatar: "", + }, + performers: [ + { + id: 12, + avatar: "", + }, + { + id: 25, + avatar: "", + }, + { + id: 26, + avatar: "", + }, + ], + tags: [ + { + id: 2, + name: "123", + color: "accent", + }, + ], + score: 10, + filtes: [], + }, + ]; + + this.completedTasks.set(mockCompleteTasks); + } + + openDetailTask(taskId: number): void { + this.kanbanBoardDetailInfoService.openDetailTask(taskId); + } + + ngOnDestroy(): void { + this.subscriptions.forEach($ => $.unsubscribe()); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.html new file mode 100644 index 00000000..1db16308 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.html @@ -0,0 +1,104 @@ + + +
      + @for (boardColumn of boardColumns(); track $index) { +
      + @if (selectedColumnId === boardColumn.id && editColumn) { @if (taskForm.get("columnTitle"); as + columnTitle) { + + + } } @else { +
      +

      {{ boardColumn.tasks.length }}

      +
      + @if (boardColumn.locked) { + + } @if (!(selectedColumnId === boardColumn.id && editColumn)) { +

      {{ boardColumn.name }}

      + } +
      + +
      + + + @if (isColumnInfoOpen && (selectedColumnId === boardColumn.id)) { + + } +
      +
      + } + +
      + @for (task of boardColumn.tasks; track task.id) { + + } @if (addTaskClick) { @if (selectedColumnId === boardColumn.id) { @if + (taskForm.get("taskTitle"); as taskTitle) { +
      + +
      + } } } +
      + + @if (isLeader || isExternal) { + + } +
      + } + +
      +
      + +
      +
      +
      diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.scss similarity index 94% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss rename to projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.scss index c0827a47..6d397184 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.scss @@ -1,11 +1,4 @@ .kanban { - &__wrapper { - position: relative; - display: grid; - grid-template-columns: 1fr 9fr; - grid-gap: 20px; - } - &__column { flex: 0 0 240px; min-width: 240px; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.ts similarity index 79% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.ts index 88070357..f473245b 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.ts @@ -10,20 +10,9 @@ import { OnInit, signal, } from "@angular/core"; -import { Subscription } from "rxjs"; -import { ProjectDataService } from "../services/project-data.service"; -import { Project } from "@office/models/project.model"; -import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; -import { ActivatedRoute, Router } from "@angular/router"; -import { IconComponent, InputComponent } from "@ui/components"; -import { KanbanTaskComponent } from "./shared/task/kanban-task.component"; -import { ClickOutsideModule } from "ng-click-outside"; -import { TaskDetailComponent } from "./shared/task/detail/task-detail.component"; +import { InputComponent } from "@ui/components"; import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; -import { kanbanColumnInfo } from "projects/core/src/consts/other/kanban-column-info.const"; -import { Column } from "./models/column.model"; -import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { ControlErrorPipe } from "@corelib"; +import { KanbanTaskComponent } from "../shared/task/kanban-task.component"; import { CdkDrag, CdkDragDrop, @@ -31,8 +20,15 @@ import { moveItemInArray, transferArrayItem, } from "@angular/cdk/drag-drop"; -import { TaskPreview } from "./models/task.model"; -import { KanbanBoardInfoService } from "./services/kanban-board-info.service"; +import { TaskPreview } from "../models/task.model"; +import { kanbanColumnInfo } from "projects/core/src/consts/other/kanban-column-info.const"; +import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; +import { ActivatedRoute } from "@angular/router"; +import { KanbanBoardDetailInfoService } from "../services/kanban-board-detail-info.service"; +import { Subscription } from "rxjs"; +import { Column } from "../models/column.model"; +import { IconComponent } from "@uilib"; +import { ControlErrorPipe } from "@corelib"; @Component({ selector: "app-kanban-board", @@ -40,12 +36,9 @@ import { KanbanBoardInfoService } from "./services/kanban-board-info.service"; styleUrl: "./kanban-board.component.scss", imports: [ CommonModule, - KanbanBoardSidebarComponent, IconComponent, KanbanTaskComponent, - ClickOutsideModule, ReactiveFormsModule, - TaskDetailComponent, DropdownComponent, InputComponent, ControlErrorPipe, @@ -55,12 +48,11 @@ import { KanbanBoardInfoService } from "./services/kanban-board-info.service"; standalone: true, }) export class KanbanBoardComponent implements OnInit, OnDestroy { - private readonly kanbanBoardInfoService = inject(KanbanBoardInfoService); + private readonly kanbanBoardDetailInfoService = inject(KanbanBoardDetailInfoService); private readonly route = inject(ActivatedRoute); - private readonly router = inject(Router); private readonly fb = inject(FormBuilder); private readonly cdRef = inject(ChangeDetectorRef); - private subscriptions: Subscription[] = []; + private readonly subscriptions: Subscription[] = []; constructor() { this.taskForm = this.fb.group({ @@ -89,20 +81,20 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { return kanbanColumnInfo; } - readonly isLeader = this.kanbanBoardInfoService.isLeader(); - readonly isExternal = this.kanbanBoardInfoService.isExternal(); + readonly isLeader = this.kanbanBoardDetailInfoService.isLeader(); + readonly isExternal = this.kanbanBoardDetailInfoService.isExternal(); ngOnInit(): void { - const detailInfoUrl$ = this.route.queryParams.subscribe({ - next: params => { - if (params["taskId"]) { - this.isTaskDetailOpen.set(true); - } - }, + const detailInfoUrl$ = this.kanbanBoardDetailInfoService.route.queryParams.subscribe(params => { + this.isTaskDetailOpen.set(!!params["taskId"]); }); this.subscriptions.push(detailInfoUrl$); + this.kanbanBoardDetailInfoService.onTaskDelete().subscribe(taskId => { + this.onDeleteTask(taskId); + }); + const boardInfo$ = this.route.data.subscribe({ next: columns => { this.boardColumns.set(columns as Column[]); @@ -228,38 +220,18 @@ export class KanbanBoardComponent implements OnInit, OnDestroy { } openDetailTask(taskId: number): void { - this.router.navigate([], { - queryParams: { - taskId, - }, - relativeTo: this.route, - queryParamsHandling: "merge", - }); - this.isTaskDetailOpen.set(true); + this.kanbanBoardDetailInfoService.openDetailTask(taskId); } - closeDetailTask(): void { - this.router.navigate([], { - queryParams: {}, - replaceUrl: true, - }); - this.isTaskDetailOpen.set(false); - } - - onDeleteTask(): void { - const taskId = +this.route.snapshot.queryParams["taskId"]; - - if (!taskId) return; - - this.closeDetailTask(); - + onDeleteTask(taskId: number): void { this.boardColumns.update(columns => - columns.map(column => ({ - ...column, - tasks: column.tasks.filter((task: TaskPreview) => task.id !== taskId), + columns.map(col => ({ + ...col, + tasks: col.tasks.filter((task: TaskPreview) => task.id !== taskId), })) ); + this.kanbanBoardDetailInfoService.closeDetailTask(); this.cdRef.detectChanges(); } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.html new file mode 100644 index 00000000..e6372d01 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.html @@ -0,0 +1,15 @@ + + +
      +
      + + +
      + +
      + + @if (isTaskDetailOpen()) { + + } +
      +
      diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.scss new file mode 100644 index 00000000..eb5d932b --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.scss @@ -0,0 +1,17 @@ +.kanban { + &__wrapper { + position: relative; + display: grid; + grid-template-columns: 1fr 10fr 1fr; + grid-gap: 20px; + } + + &__main { + display: flex; + flex-direction: column; + } + + &__right { + position: relative; + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts new file mode 100644 index 00000000..6ff26fd0 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts @@ -0,0 +1,46 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, OnInit, signal } from "@angular/core"; +import { RouterOutlet } from "@angular/router"; +import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; +import { TaskDetailComponent } from "./shared/task/detail/task-detail.component"; +import { KanbanBoardDetailInfoService } from "./services/kanban-board-detail-info.service"; +import { Subscription } from "rxjs"; +import { ClickOutsideModule } from "ng-click-outside"; + +@Component({ + selector: "app-kanban", + templateUrl: "./kanban.component.html", + styleUrl: "./kanban.component.scss", + imports: [ + CommonModule, + RouterOutlet, + KanbanBoardSidebarComponent, + TaskDetailComponent, + ClickOutsideModule, + ], + standalone: true, +}) +export class KanbanComponent implements OnInit { + private readonly kanbanBoardDetailInfoService = inject(KanbanBoardDetailInfoService); + + readonly isTaskDetailOpen = signal(false); + private readonly subscriptions: Subscription[] = []; + + ngOnInit(): void { + const detailInfoUrl$ = this.kanbanBoardDetailInfoService.route.queryParams.subscribe(params => { + this.isTaskDetailOpen.set(!!params["taskId"]); + }); + + this.subscriptions.push(detailInfoUrl$); + } + + ngOnDestroy(): void { + this.subscriptions.forEach($ => $.unsubscribe()); + } + + closeDetailTask(): void { + this.kanbanBoardDetailInfoService.closeDetailTask(); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.guard.ts b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.guard.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.guard.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/kanban.guard.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.resolver.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts new file mode 100644 index 00000000..196f754f --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts @@ -0,0 +1,17 @@ +/** @format */ + +import { Routes } from "@angular/router"; +import { KanbanBoardComponent } from "./board/kanban-board.component"; +import { KanbanArhiveComponent } from "./archive/kanban-archive.component"; + +export const KANBAN_ROUTES: Routes = [ + { path: "", pathMatch: "full", redirectTo: "board" }, + { + path: "board", + component: KanbanBoardComponent, + }, + { + path: "archive", + component: KanbanArhiveComponent, + }, +]; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/board.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban/models/board.model.ts new file mode 100644 index 00000000..97eac0b4 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/models/board.model.ts @@ -0,0 +1,34 @@ +/** @format */ + +export interface Board { + id: number; + name: string; + description: string; + color: + | "primary" + | "secondary" + | "accent" + | "accent-medium" + | "blue-dark" + | "cyan" + | "red" + | "complete" + | "complete-dark" + | "soft"; + icon: + | "task" + | "key" + | "command" + | "anchor" + | "in-search" + | "suitcase" + | "person" + | "deadline" + | "main" + | "attach" + | "send" + | "contacts" + | "graph" + | "phone" + | "people-bold"; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban/models/column.model.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/models/column.model.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/models/column.model.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/comments.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban/models/comments.model.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/models/comments.model.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/models/comments.model.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/comment.model.dto.ts b/projects/social_platform/src/app/office/projects/detail/kanban/models/dto/comment.model.dto.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/comment.model.dto.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/models/dto/comment.model.dto.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/performer.model.dto.ts b/projects/social_platform/src/app/office/projects/detail/kanban/models/dto/performer.model.dto.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/performer.model.dto.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/models/dto/performer.model.dto.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/tag.model.dto.ts b/projects/social_platform/src/app/office/projects/detail/kanban/models/dto/tag.model.dto.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/models/dto/tag.model.dto.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/models/dto/tag.model.dto.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts b/projects/social_platform/src/app/office/projects/detail/kanban/models/task.model.ts similarity index 97% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/models/task.model.ts index 59e9ab5b..20598c5b 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/models/task.model.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/models/task.model.ts @@ -21,6 +21,7 @@ export interface TaskPreview { type: number; priority: number; description: string | null; + startDate: string | null; deadlineDate: string | null; tags: Tag[]; goal: Pick | null; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board-info.service.ts b/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-detail-info.service.ts similarity index 67% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board-info.service.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-detail-info.service.ts index 3bc65f00..bc03c9ec 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board-info.service.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-detail-info.service.ts @@ -4,13 +4,14 @@ import { computed, inject, Injectable, signal } from "@angular/core"; import { TaskDetail } from "../models/task.model"; import { User } from "@auth/models/user.model"; import { AuthService } from "@auth/services"; -import { filter } from "rxjs"; +import { filter, Observable, of, Subject } from "rxjs"; import { ProjectDataService } from "../../services/project-data.service"; +import { ActivatedRoute, Router } from "@angular/router"; @Injectable({ providedIn: "root", }) -export class KanbanBoardInfoService { +export class KanbanBoardDetailInfoService { taskDetail = signal( undefined // { @@ -54,10 +55,14 @@ export class KanbanBoardInfoService { // } ); - currentUser = signal(null); + readonly currentUser = signal(null); private readonly authService = inject(AuthService); private readonly projectDataService = inject(ProjectDataService); + private readonly router = inject(Router); + readonly route = inject(ActivatedRoute); + + private deleteTaskSubject = new Subject(); constructor() { this.authService.profile @@ -114,4 +119,59 @@ export class KanbanBoardInfoService { }); isLeaderLeaveComment = computed(() => this.taskDetail()?.isLeaderLeaveComment); + + isArchivePage = computed(() => { + return location.href.includes("archive"); + }); + + isOverdue = computed(() => { + const task = this.taskDetail(); + + if (!task) return; + + if (!task.deadlineDate) return false; + + const nowDate = new Date(); + const deadline = new Date(task.deadlineDate); + + return nowDate > deadline; + }); + + diffDaysOfCompletedTask = computed(() => { + const task = this.taskDetail(); + + if (!task) return; + + if (!task.deadlineDate || !task.startDate) return 0; + + const start = new Date(task.startDate); + const end = new Date(task.deadlineDate); + + const diffMs = end.getTime() - start.getTime(); + + return diffMs / (1000 * 60 * 60 * 24); + }); + + closeDetailTask(): void { + this.router.navigate([], { + queryParams: { taskId: null }, + queryParamsHandling: "merge", + replaceUrl: true, + }); + } + + openDetailTask(taskId: number): void { + this.router.navigate([], { + queryParams: { taskId }, + queryParamsHandling: "merge", + }); + } + + requestDeleteTask(taskId: number): void { + this.deleteTaskSubject.next(taskId); + } + + onTaskDelete(): Observable { + return this.deleteTaskSubject.asObservable(); + } } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-info.service.ts b/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-info.service.ts new file mode 100644 index 00000000..3400fa79 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-info.service.ts @@ -0,0 +1,58 @@ +/** @format */ + +import { computed, Injectable, signal } from "@angular/core"; +import { Board } from "../models/board.model"; + +@Injectable({ providedIn: "root" }) +export class KanbanBoardInfoService { + readonly boardInfo = signal({ + id: 1, + name: "123", + description: + "bhbhhbhbbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhhbbhbhhbbhbhbhhbbhbhbhbhbhbhbhhbhbhbbhbhbhbhhbbhhbbhbhbhbhhbhbbhbhbhbhhbhbbhbhbhhbbhhbhbhbhbhbhbbhbhhbbhhbhbhbbhbhhbbhbhbhbhbhbhbhbhbhhbbhbhbhbhbhbhhb", + color: "accent", + icon: "task", + }); + + readonly boards = signal([ + { + id: 1, + name: "123", + description: + "bhbhhbhbbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhbhhbbhbhhbbhbhbhhbbhbhbhbhbhbhbhhbhbhbbhbhbhbhhbbhhbbhbhbhbhhbhbbhbhbhbhhbhbbhbhbhhbbhhbhbhbhbhbhbbhbhhbbhhbhbhbbhbhhbbhbhbhbhbhbhbhbhbhhbbhbhbhbhbhbhhb", + color: "accent", + icon: "task", + }, + { + id: 2, + name: "456", + description: "kklmklmsklmcslkmcdskmcdslkcdslkmcdsklmscklmcdsklmsdc", + color: "blue-dark", + icon: "command", + }, + ]); + + readonly selectedBoardId = signal(0); + + setBoardInProject(board: Board): void { + this.boardInfo.set(board); + } + + setBoardsInProject(boards: Board[]): void { + this.boards.set(boards); + } + + setSelectedBoard(id: number) { + this.selectedBoardId.set(id); + } + + isFirstBoard = computed(() => { + const id = this.selectedBoardId(); + const boards = this.boards(); + + if (!boards || id === null) return false; + + const index = boards.findIndex(board => board.id === id); + return index === 0; + }); +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board.service.ts b/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board.service.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/services/kanban-board.service.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board.service.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.html similarity index 94% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.html index 0bac38b6..017fb460 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.html +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.html @@ -12,7 +12,7 @@
    @if (isLeader()) { -
    +
    } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/actions/kanban-board-actions.component.scss rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.ts new file mode 100644 index 00000000..1e4d1d75 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.ts @@ -0,0 +1,25 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, EventEmitter, inject, Output } from "@angular/core"; +import { IconComponent } from "@uilib"; +import { KanbanBoardDetailInfoService } from "../../services/kanban-board-detail-info.service"; + +@Component({ + selector: "app-kanban-board-actions", + templateUrl: "./kanban-board-actions.component.html", + styleUrl: "./kanban-board-actions.component.scss", + imports: [CommonModule, IconComponent], + standalone: true, +}) +export class KanbanBoardActionsComponent { + @Output() openCreation = new EventEmitter(); + + private readonly kanbanBoardDetailInfoService = inject(KanbanBoardDetailInfoService); + readonly isLeader = this.kanbanBoardDetailInfoService.isLeader; + + addBoard(event: MouseEvent): void { + event.stopPropagation(); + this.openCreation.emit(true); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.html new file mode 100644 index 00000000..053bac68 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.html @@ -0,0 +1,48 @@ + + +
    + @if (cancelTaskForm.get("description"); as description) { +
    + + @if (description | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } @if (description | controlError: "maxlength") { +
    + {{ errorMessage.VALIDATION_TOO_LONG }} + @if (description.errors) { + {{ description.errors["maxlength"]["requiredLength"] }} + } +
    + } @if (description | controlError: "minlength") { +
    + {{ errorMessage.VALIDATION_TOO_SHORT }} + @if (description.errors) { + {{ description.errors["minlength"]["requiredLength"] }} + } +
    + } +
    + } + + + +
    + @for (answer of quickAnswers; track $index) { + {{ + answer.title + }} + } +
    + + отменить результат выполнения +
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.scss new file mode 100644 index 00000000..eb9e3613 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.scss @@ -0,0 +1,32 @@ +@use "styles/typography"; + +.cancel { + &__form { + display: flex; + flex-direction: column; + gap: 10px; + + label { + color: var(--grey-for-text); + } + } + + &__quick-answers { + display: flex; + flex-wrap: wrap; + gap: 10px; + + ::ng-deep { + app-tag { + .tag { + padding: 7px 10px; + cursor: pointer; + + p { + @include typography.body-12; + } + } + } + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.ts new file mode 100644 index 00000000..a05cf6b5 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.ts @@ -0,0 +1,61 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, EventEmitter, inject, Output } from "@angular/core"; +import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; +import { ControlErrorPipe, ValidationService } from "@corelib"; +import { ButtonComponent } from "@ui/components"; +import { ErrorMessage } from "@error/models/error-message"; +import { TextareaComponent } from "@ui/components/textarea/textarea.component"; +import { QuickAnswers } from "projects/core/src/consts/other/quick-answers.const"; +import { TagComponent } from "@ui/components/tag/tag.component"; + +@Component({ + selector: "app-cancel-task-form", + templateUrl: "./cancel-task-form.component.html", + styleUrl: "./cancel-task-form.component.scss", + imports: [ + CommonModule, + ReactiveFormsModule, + ButtonComponent, + ControlErrorPipe, + TextareaComponent, + TagComponent, + ], + standalone: true, +}) +export class CancelTaskFormComponent { + @Output() submit = new EventEmitter(); + + private readonly fb = inject(FormBuilder); + private readonly validationService = inject(ValidationService); + + constructor() { + this.cancelTaskForm = this.fb.group({ + description: ["", Validators.required], + }); + } + + errorMessage = ErrorMessage; + cancelTaskForm: FormGroup; + readonly quickAnswers = QuickAnswers; + + sendFormIsSubmitting = false; + + pickAnAnswer(title: string): void { + const description = this.cancelTaskForm.get("description")?.value; + this.cancelTaskForm.patchValue({ + description: (description.length ? description : null) + " " + title, + }); + } + + onSubmit(event: Event): void { + if (!this.validationService.getFormValidation(this.cancelTaskForm)) return; + + this.sendFormIsSubmitting = true; + + // TODO логика отправки формы для отмены выполнения задачи + event.stopPropagation(); + this.submit.emit(); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.html new file mode 100644 index 00000000..05534ac5 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.html @@ -0,0 +1,60 @@ + + +
    +
    +
    + @if (createBoardForm.get("title"); as title) { + + @if (title | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } } +
    + +
    + @if (createBoardForm.get("color"); as color) { @for (colorItem of tagColors; track $index) { +
    + } } +
    + +
    + @if (createBoardForm.get("description"); as description) { + + @if (description | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } @if (description | controlError: "maxlength") { +
    + {{ errorMessage.VALIDATION_TOO_LONG }} + @if (description.errors) { + {{ description.errors["maxlength"]["requiredLength"] }} + } +
    + } @if (description | controlError: "minlength") { +
    + {{ errorMessage.VALIDATION_TOO_SHORT }} + @if (description.errors) { + {{ description.errors["minlength"]["requiredLength"] }} + } +
    + } } +
    + +
    + @if (createBoardForm.get("icon"); as icon) { @for (icon of kanbanIcons.slice(0, 13); track + $index) { + + } } +
    +
    +
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.scss new file mode 100644 index 00000000..00a54399 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.scss @@ -0,0 +1,87 @@ +@use "styles/typography"; + +.create-board { + position: relative; + z-index: 1000; + width: 151px; + padding: 10px 22px 10px 30px; + background-color: var(--light-white); + border-radius: var(--rounded-md); + + &__form { + display: flex; + flex-direction: column; + gap: 4px; + } + + &__title { + input { + width: 93px; + height: 14px; + padding: 2px 4px; + } + } + + &__colors { + display: flex; + gap: 3px; + align-items: center; + } + + &__pick-color { + width: 9px; + height: 9px; + cursor: pointer; + border-radius: var(--rounded-sm); + } + + &__pick-color, + i { + cursor: pointer; + } + + &__description { + textarea { + width: 93px; + height: 49px; + } + } + + input, + textarea { + display: flex; + align-items: flex-start; + justify-content: flex-start; + padding: 5px; + resize: none; + background-color: #d9d9d9; + border: none; + border-radius: var(--rounded-sm); + outline: none; + + &::placeholder { + @include typography.body-6; + + display: flex; + align-items: flex-start; + justify-content: flex-start; + } + + &:focus { + border-color: none; + box-shadow: none; + } + } + + &__icons { + display: grid; + grid-template-rows: 1fr 1fr; + grid-template-columns: repeat(8, 1fr); + grid-gap: 7px; + + i, + svg { + color: var(--black); + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.ts new file mode 100644 index 00000000..dd50e6f5 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.ts @@ -0,0 +1,62 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, OnDestroy, OnInit } from "@angular/core"; +import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; +import { Subscription } from "rxjs"; +import { IconComponent } from "@ui/components"; +import { ControlErrorPipe } from "@corelib"; +import { ErrorMessage } from "@error/models/error-message"; +import { tagColors } from "projects/core/src/consts/other/tag-colors.const"; +import { KanbanIcons } from "projects/core/src/consts/other/kanban-icons.const"; + +@Component({ + selector: "app-create-board-form", + templateUrl: "./create-board-form.component.html", + styleUrl: "./create-board-form.component.scss", + imports: [CommonModule, ReactiveFormsModule, ControlErrorPipe, IconComponent], + standalone: true, +}) +export class CreateBoardFormComponent implements OnInit, OnDestroy { + private readonly fb = inject(FormBuilder); + + constructor() { + this.createBoardForm = this.fb.group({ + title: ["", [Validators.required, Validators.maxLength(20)]], + description: [null, Validators.maxLength(200)], + color: [null], + icon: [null], + }); + } + + get tagColors() { + return tagColors; + } + + get kanbanIcons() { + return KanbanIcons; + } + + createBoardForm: FormGroup; + errorMessage = ErrorMessage; + subscriptions: Subscription[] = []; + + ngOnInit(): void {} + + ngOnDestroy(): void { + this.subscriptions.forEach($ => $.unsubscribe()); + } + + pickOption(control: "color" | "icon", value: string): void { + this.createBoardForm.patchValue({ [control]: value }); + } + + private resetForm(): void { + this.createBoardForm.reset({ + title: "", + description: null, + color: null, + icon: null, + }); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.html rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.scss rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.ts similarity index 87% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.ts index 4c959bf7..35e7296a 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.ts @@ -11,7 +11,7 @@ import { Output, SimpleChanges, } from "@angular/core"; -import { tagColorsList } from "projects/core/src/consts/lists/tag-colots.list.const"; +import { tagColors } from "projects/core/src/consts/other/tag-colors.const"; import { FormBuilder, FormGroup, @@ -38,7 +38,7 @@ export class CreateTagFormComponent implements OnInit, OnChanges { constructor() { this.tagForm = this.fb.group({ tagName: ["", [Validators.required, Validators.maxLength(30)]], - tagColor: [tagColorsList[0].name, [Validators.required]], + tagColor: [tagColors[0].name, [Validators.required]], }); } @@ -46,13 +46,13 @@ export class CreateTagFormComponent implements OnInit, OnChanges { openPickColors = false; get tagColors() { - return tagColorsList; + return tagColors; } get selectedColor(): string { const colorName = this.tagForm.get("tagColor")?.value; - const found = tagColorsList.find(c => c.name === colorName); - return found ? found.color : tagColorsList[0].color; + const found = tagColors.find(c => c.name === colorName); + return found ? found.color : tagColors[0].color; } get isEditMode(): boolean { @@ -97,7 +97,7 @@ export class CreateTagFormComponent implements OnInit, OnChanges { private resetForm(): void { this.tagForm.reset({ tagName: "", - tagColor: tagColorsList[0].name, + tagColor: tagColors[0].name, }); } diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.html new file mode 100644 index 00000000..7d2cb2bf --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.html @@ -0,0 +1,45 @@ + + +
    + @if (projectBoardInfo()) { +
    +
    + +
    + + @if (isBoardInfoOpen()) { +
    + @if (boardInfo(); as boardInfo) { +
    +

    {{ boardInfo.name }}

    +
    + +

    {{ boardInfo.description }}

    + } +
    + } + + +
    + } @if (isCreateBoardForm()) { +
    + +
    + } + + +
    diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.scss new file mode 100644 index 00000000..7b486da1 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.scss @@ -0,0 +1,54 @@ +.kanban { + &__sidebar { + position: relative; + display: flex; + flex-direction: column; + gap: 15px; + align-items: center; + justify-content: flex-start; + width: 68px; + height: 60vh; + max-height: 373px; + padding: 15px; + background-color: var(--light-white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + + &-info { + position: absolute; + top: 0%; + left: 110%; + width: 245px; + padding: 24px; + background-color: var(--light-white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-lg); + + p { + line-break: anywhere; + white-space: pre-wrap; + } + } + } + + &__create-board { + position: absolute; + bottom: 0%; + left: 110%; + } +} + +.lists { + &__section { + display: flex; + justify-content: space-between; + width: 100%; + margin-bottom: 8px; + border-bottom: 0.5px solid var(--accent); + } + + &__title { + margin-bottom: 8px; + color: var(--accent); + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.ts new file mode 100644 index 00000000..1ca83a93 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.ts @@ -0,0 +1,134 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, Input, signal } from "@angular/core"; +import { Project } from "@office/models/project.model"; +import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { KanbanBoardActionsComponent } from "../actions/kanban-board-actions.component"; +import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; +import { ClickOutsideModule } from "ng-click-outside"; +import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; +import { Router } from "@angular/router"; +import { KanbanBoardInfoService } from "../../services/kanban-board-info.service"; +import { CreateBoardFormComponent } from "../create-board-form/create-board-form.component"; + +@Component({ + selector: "app-kanban-board-sidebar", + templateUrl: "./kanban-board-sidebar.component.html", + styleUrl: "./kanban-board-sidebar.component.scss", + imports: [ + CommonModule, + AvatarComponent, + KanbanBoardActionsComponent, + DropdownComponent, + ClickOutsideModule, + CreateBoardFormComponent, + ], + standalone: true, +}) +export class KanbanBoardSidebarComponent { + private readonly projectDataService = inject(ProjectDataService); + private readonly kanbanBoardInfoService = inject(KanbanBoardInfoService); + private readonly router = inject(Router); + + readonly boardInfo = this.kanbanBoardInfoService.boardInfo; + readonly isFirstBoard = this.kanbanBoardInfoService.isFirstBoard; + readonly projectBoardInfo = this.projectDataService.project; + + isContextMenuOpen = signal(false); + isBoardInfoOpen = signal(false); + isCreateBoardForm = signal(false); + + get contextMenuOptions() { + return [ + { + id: 1, + label: "выгрузка доски", + value: "", + }, + { + id: 2, + label: "архив выполнено", + value: "", + }, + { + id: 3, + label: "выгрузка архива выполнено", + value: "", + }, + { + id: 4, + label: "информация о доске", + value: "", + }, + { + id: 5, + label: "редактировать", + value: "", + }, + ]; + } + + onContextSelect(option: any, state: boolean) { + switch (option) { + case 1: { + console.log(option); + break; + } + + case 2: { + this.navigateTo("archive", this.projectBoardInfo()!); + break; + } + + case 4: { + this.isBoardInfoOpen.set(true); + break; + } + + case 5: { + if (!this.isFirstBoard()) { + console.log("edited"); + } + break; + } + } + + this.isContextMenuOpen.set(state); + } + + onMouseDown(event: MouseEvent, board: any): void { + event.stopPropagation(); + + if (event.button === 2 || event.ctrlKey) { + event.preventDefault(); + this.isContextMenuOpen.set(true); + return; + } + + if (event.button === 0) { + this.navigateTo("project", this.projectBoardInfo()!); + + this.kanbanBoardInfoService.setSelectedBoard(board.id); + } + } + + onBoardCreate(openCreation: boolean): void { + this.isCreateBoardForm.set(openCreation); + } + + private navigateTo(type: "project" | "archive", projectBoardInfo: Project): void { + switch (type) { + case "project": { + this.router.navigate(["office/projects/" + projectBoardInfo.id + "/kanban/board/"]); + console.log(projectBoardInfo.id); + break; + } + + case "archive": { + this.router.navigate(["office/projects/" + projectBoardInfo.id + "/kanban/archive"]); + break; + } + } + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.html rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.scss rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.ts similarity index 93% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.ts index 0200152d..05d9c5cb 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/detail/task-detail.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.ts @@ -58,7 +58,7 @@ import { } from "@angular/cdk/scrolling"; import { TagDto } from "../../../models/dto/tag.model.dto"; import { PerformerDto } from "../../../models/dto/performer.model.dto"; -import { KanbanBoardInfoService } from "../../../services/kanban-board-info.service"; +import { KanbanBoardDetailInfoService } from "../../../services/kanban-board-detail-info.service"; import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; @Component({ @@ -101,7 +101,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { private readonly skillsService = inject(SkillsService); private readonly kanbanBoardService = inject(KanbanBoardService); - private readonly kanbanBoardInfoService = inject(KanbanBoardInfoService); + private readonly kanbanBoardDetailInfoService = inject(KanbanBoardDetailInfoService); private readonly projectDataService = inject(ProjectDataService); private readonly fileService = inject(FileService); private readonly snackbarService = inject(SnackbarService); @@ -225,18 +225,18 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { subscriptions: Subscription[] = []; - readonly taskDetailInfo = this.kanbanBoardInfoService.taskDetail; - readonly leaderId = this.kanbanBoardInfoService.leaderId; + readonly taskDetailInfo = this.kanbanBoardDetailInfoService.taskDetail; + readonly leaderId = this.kanbanBoardDetailInfoService.leaderId; readonly collaborators = this.projectDataService.collaborators; readonly goals = this.projectDataService.goals; - readonly isLeaderLeaveComment = this.kanbanBoardInfoService.isLeaderLeaveComment; - readonly isLeader = this.kanbanBoardInfoService.isLeader; - readonly isPerformer = this.kanbanBoardInfoService.isPerformer; - readonly isResponsible = this.kanbanBoardInfoService.isResponsible; - readonly isCreator = this.kanbanBoardInfoService.isCreator; - readonly isExternal = this.kanbanBoardInfoService.isExternal; - readonly isTaskResult = this.kanbanBoardInfoService.isTaskResult; - readonly isLeaderAcceptResult = this.kanbanBoardInfoService.isLeaderAcceptResult; + readonly isLeaderLeaveComment = this.kanbanBoardDetailInfoService.isLeaderLeaveComment; + readonly isLeader = this.kanbanBoardDetailInfoService.isLeader; + readonly isPerformer = this.kanbanBoardDetailInfoService.isPerformer; + readonly isResponsible = this.kanbanBoardDetailInfoService.isResponsible; + readonly isCreator = this.kanbanBoardDetailInfoService.isCreator; + readonly isExternal = this.kanbanBoardDetailInfoService.isExternal; + readonly isTaskResult = this.kanbanBoardDetailInfoService.isTaskResult; + readonly isLeaderAcceptResult = this.kanbanBoardDetailInfoService.isLeaderAcceptResult; get actionTypeOptions() { return actionTypeList; @@ -332,6 +332,14 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { } ngOnInit(): void { + console.log( + "IS CREATOR" + " " + this.isCreator(), + "IS LEADER" + " " + this.isLeader(), + "IS PERFORMER" + " " + this.isPerformer(), + "IS RESPONSIBLE" + " " + this.isResponsible(), + "IS EXTERNAL" + " " + this.isExternal() + ); + this.updateDescriptionState(); } @@ -529,16 +537,19 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { break; } - case "delete": + case "delete": { + this.isDeleteTypeOpen = state; + if (typeId !== undefined) { - this.isDeleteTypeOpen = state; + const taskId = +this.route.snapshot.queryParams["taskId"]; if (this.isCreator() || this.isLeader()) { - this.delete.emit(); + this.kanbanBoardDetailInfoService.requestDeleteTask(taskId); } } break; + } default: break; @@ -627,8 +638,6 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { .pipe(map(r => r.url)) .subscribe({ next: url => { - console.log(url); - setTimeout(() => { this.attachFiles[i].loading = false; this.attachFiles[i].link = url; @@ -707,7 +716,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { const newMessage = { id: Date.now(), text, - author: this.kanbanBoardInfoService.currentUser(), + author: this.kanbanBoardDetailInfoService.currentUser(), createdAt: new Date().toISOString(), isRead: false, replyTo: this.replyMessage?.id ?? null, @@ -816,7 +825,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { const taskDetailInfo$ = this.kanbanBoardService.getTaskById(taskId).subscribe({ next: (taskDetailInfo: TaskDetail) => { - this.kanbanBoardInfoService.setTaskDetailInfo(taskDetailInfo); + this.kanbanBoardDetailInfoService.setTaskDetailInfo(taskDetailInfo); this.taskDetailForm.patchValue({ title: taskDetailInfo.title ?? "", @@ -834,7 +843,7 @@ export class TaskDetailComponent implements OnInit, AfterViewInit, OnDestroy { description: taskDetailInfo.description ?? null, files: taskDetailInfo.files ?? [], score: taskDetailInfo.score ?? 1, - creator: taskDetailInfo.creator ?? this.kanbanBoardInfoService.currentUser(), + creator: taskDetailInfo.creator ?? this.kanbanBoardDetailInfoService.currentUser(), createdAt: taskDetailInfo.datetimeCreated ?? new Date(), }); diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.html b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.html new file mode 100644 index 00000000..c6c3cfaf --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.html @@ -0,0 +1,86 @@ + + +
    +
    + {{ task.title }} + @if (task.description) { +

    {{ task.description }}

    + } @if (task.responsible || (task.performers && task.performers.length > 0) || task.files || + task.type) { +
    +
    + @if (task.responsible; as responsible) { +
    + + +
    + } +
    + + @if (task.performers; as performers) { @if (performers.length > 0) { @for (performer of + performers; track $index) { + + } } } +
    +
    + + @if (task.files || task.type) { +
    + + +
    + } +
    + } @if (task.deadlineDate || task.tags || task.goal) { +
    +
    + @if (task.deadlineDate) { @if (!isArchivePage()) { +
    + +

    + {{ task.deadlineDate }} +

    +
    + } @else if (diffDays() || task.deadlineDate || task.startDate) { + {{ + diffDays() + " " + (diffDays()! | pluralize: ["день", "дня", "дней"]) + }} + } } @if (isArchivePage() && isOverdue()) { + просрочено + } @if (task.tags[0]; as tag) { + {{ "#" + tag.name }} + } @if (!isArchivePage()) { @if (task.goal; as goal) { + {{ goal.title }} + } } +
    + + @if (isLeader()) { + отменить + } +
    + } +
    + +
    + @if (task.priority) { +
    + } + +
    +
    + + +
    +
    +

    отмена выполнения задачи

    + +
    + + +
    +     diff --git a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.scss similarity index 61% rename from projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss rename to projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.scss index a4d6accf..64760742 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban-board/shared/task/kanban-task.component.scss +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.scss @@ -59,7 +59,31 @@ ::ng-deep { app-tag { .tag { - padding: 2px 10px; + padding: 0; + } + } + } + } + + &-bottom--start { + display: flex; + gap: 4px; + align-items: center; + } + + &-bottom--completed { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + } + + &-cancel { + ::ng-deep { + app-tag { + .tag { + padding: 0; + margin: 0; } } } @@ -73,17 +97,19 @@ } &-responsible, - &-deadline { + &-deadline, + &-performers { display: flex; gap: 2px; align-items: center; app-avatar { - margin-left: -2px; + margin-left: -8px; } i { - min-width: 6px; + min-width: 8px; + margin-right: 6px; } } @@ -107,3 +133,33 @@ } } } + +.lists { + &__section { + display: flex; + justify-content: space-between; + width: 100%; + margin-bottom: 8px; + border-bottom: 0.5px solid var(--accent); + } + + &__icon { + color: var(--accent); + } + + &__title { + margin-bottom: 8px; + color: var(--accent); + } +} + +.cancel { + display: flex; + flex-direction: column; + align-items: stretch; + justify-content: center; + width: 600px; + max-height: calc(100vh - 40px); + padding: 24px; + overflow-y: auto; +} diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.ts new file mode 100644 index 00000000..8d1abce2 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.ts @@ -0,0 +1,49 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, computed, inject, Input } from "@angular/core"; +import { IconComponent } from "@uilib"; +import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { TagComponent } from "@ui/components/tag/tag.component"; +import { RouterModule } from "@angular/router"; +import { getPriorityType } from "@utils/helpers/getPriorityType"; +import { TaskPreview } from "../../models/task.model"; +import { KanbanBoardDetailInfoService } from "../../services/kanban-board-detail-info.service"; +import { PluralizePipe } from "@corelib"; +import { CancelTaskFormComponent } from "../cancel-task-form/cancel-task-form.component"; +import { ModalComponent } from "@ui/components/modal/modal.component"; + +@Component({ + selector: "app-kanban-task", + templateUrl: "./kanban-task.component.html", + styleUrl: "./kanban-task.component.scss", + imports: [ + CommonModule, + RouterModule, + IconComponent, + AvatarComponent, + TagComponent, + PluralizePipe, + CancelTaskFormComponent, + ModalComponent, + ], + standalone: true, +}) +export class KanbanTaskComponent { + @Input({ required: true }) task!: TaskPreview; + + private readonly kanbanBoardDetailInfoService = inject(KanbanBoardDetailInfoService); + + readonly isArchivePage = this.kanbanBoardDetailInfoService.isArchivePage; + readonly isOverdue = this.kanbanBoardDetailInfoService.isOverdue; + readonly isLeader = this.kanbanBoardDetailInfoService.isLeader; + readonly diffDays = this.kanbanBoardDetailInfoService.diffDaysOfCompletedTask; + + isCancelFormOpen = false; + + getPriorityType = getPriorityType; + + onToggleCancelTaskForm(): void { + this.isCancelFormOpen = !this.isCancelFormOpen; + } +} diff --git a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html b/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html index d192016e..43b4b5ac 100644 --- a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html +++ b/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html @@ -8,7 +8,7 @@

    мои задачи

    - + открыть доску задач diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts index 56313e49..1e06646e 100644 --- a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts @@ -8,8 +8,8 @@ import { IconComponent } from "@uilib"; import { getPriorityType } from "@utils/helpers/getPriorityType"; import { TagComponent } from "../tag/tag.component"; import { ClickOutsideModule } from "ng-click-outside"; -import { CreateTagFormComponent } from "@office/projects/detail/kanban-board/shared/create-tag-form/create-tag-form.component"; -import { TagDto } from "@office/projects/detail/kanban-board/models/dto/tag.model.dto"; +import { CreateTagFormComponent } from "@office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component"; +import { TagDto } from "@office/projects/detail/kanban/models/dto/tag.model.dto"; @Component({ selector: "app-dropdown", diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.html b/projects/social_platform/src/app/ui/components/tag/tag.component.html index dc4337f4..46c5dc08 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.html +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.html @@ -14,6 +14,9 @@ [class.tag--soft]="color === 'soft'" [class.tag--cyan]="color === 'cyan'" [class.tag--red]="color === 'red'" + [class.tag--days]="type === 'days'" + [class.tag--overdue]="type === 'overdue'" + [class.tag--answer]="type === 'answer'" [ngStyle]="additionalTagColor ? { 'background-color': additionalTagColor } : {}" >

    diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.scss b/projects/social_platform/src/app/ui/components/tag/tag.component.scss index 2c272f9e..50415551 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.scss +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.scss @@ -67,6 +67,18 @@ border: transparent; } + &.tag--days { + color: var(--accent); + background-color: var(--light-white); + border: 0.5px solid var(--accent); + } + + &.tag--overdue { + color: var(--red); + background-color: var(--light-white); + border: 0.5px solid var(--red); + } + &:not(:last-child) { margin-right: 5px; } @@ -136,6 +148,12 @@ border: 0.5px solid var(--gold); } + &.tag--answer { + color: var(--grey-for-text); + background: transparent; + border: 0.5px solid var(--grey-for-text); + } + &:not(:last-child) { margin-right: 5px; } diff --git a/projects/social_platform/src/app/ui/components/tag/tag.component.ts b/projects/social_platform/src/app/ui/components/tag/tag.component.ts index 7f2559ee..100587a9 100644 --- a/projects/social_platform/src/app/ui/components/tag/tag.component.ts +++ b/projects/social_platform/src/app/ui/components/tag/tag.component.ts @@ -10,7 +10,7 @@ import { SimpleChanges, } from "@angular/core"; import { IconComponent } from "../icon/icon.component"; -import { tagColorsList } from "projects/core/src/consts/lists/tag-colots.list.const"; +import { tagColors } from "projects/core/src/consts/other/tag-colors.const"; import { NgStyle } from "@angular/common"; /** @@ -49,6 +49,8 @@ export class TagComponent implements OnInit, OnChanges { | "complete-dark" | "soft" = "primary"; + @Input() type?: "days" | "overdue" | "answer"; + /** Стиль отображения */ @Input() appearance: "inline" | "outline" = "inline"; @@ -64,8 +66,8 @@ export class TagComponent implements OnInit, OnChanges { /** Событие для возможности редактирования */ @Output() edit = new EventEmitter(); - get tagColorsList() { - return tagColorsList; + get tagColors() { + return tagColors; } additionalTagColor = ""; @@ -95,7 +97,7 @@ export class TagComponent implements OnInit, OnChanges { } private mappingAdditionalTagColors(): void { - const found = tagColorsList.find(tagColor => tagColor.name === this.color); + const found = tagColors.find(tagColor => tagColor.name === this.color); if (found) { this.additionalTagColor = found.color; } diff --git a/projects/social_platform/src/assets/icons/svg/command.svg b/projects/social_platform/src/assets/icons/svg/command.svg new file mode 100644 index 00000000..7b03c4bc --- /dev/null +++ b/projects/social_platform/src/assets/icons/svg/command.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/social_platform/src/assets/icons/svg/deadline.svg b/projects/social_platform/src/assets/icons/svg/deadline.svg index 3680150d..68a63f40 100644 --- a/projects/social_platform/src/assets/icons/svg/deadline.svg +++ b/projects/social_platform/src/assets/icons/svg/deadline.svg @@ -1,3 +1,3 @@ - + diff --git a/projects/social_platform/src/assets/icons/svg/person.svg b/projects/social_platform/src/assets/icons/svg/person.svg index 8746fa9c..a273e14d 100644 --- a/projects/social_platform/src/assets/icons/svg/person.svg +++ b/projects/social_platform/src/assets/icons/svg/person.svg @@ -1,3 +1,3 @@ - + diff --git a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg index 6448c6e9..dc186190 100644 --- a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg +++ b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 4213695c8d286d853920e0d5b74bab56263761af Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 9 Dec 2025 13:48:19 +0300 Subject: [PATCH 18/22] fix routing for kanban several boards & update news-card for views & createdDate --- .../shared/trajectory/trajectory.component.ts | 4 ++-- .../news-card/news-card.component.html | 14 +++++++----- .../news-card/news-card.component.scss | 17 ++++++++++++++ .../office/projects/detail/detail.routes.ts | 5 ++--- .../kanban/detail/kanban-detail.routes.ts | 17 ++++++++++++++ .../detail/kanban/kanban.component.ts | 2 +- .../projects/detail/kanban/kanban.resolver.ts | 22 +++++++++---------- .../projects/detail/kanban/kanban.routes.ts | 11 ++-------- 8 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 projects/social_platform/src/app/office/projects/detail/kanban/detail/kanban-detail.routes.ts diff --git a/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts b/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts index 5c2b5f67..56327dd9 100644 --- a/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts +++ b/projects/skills/src/app/trajectories/track-career/shared/trajectory/trajectory.component.ts @@ -24,7 +24,7 @@ import { Trajectory } from "projects/skills/src/models/trajectory.model"; import { HttpErrorResponse } from "@angular/common/http"; import { BreakpointObserver } from "@angular/cdk/layout"; import { map, Observable } from "rxjs"; -import { trajectoryMoreList } from "projects/core/src/consts/other/trajectory-more.const"; +import { trajectoryMore } from "projects/core/src/consts/other/trajectory-more.const"; /** * Компонент отображения карточки траектории @@ -53,7 +53,7 @@ import { trajectoryMoreList } from "projects/core/src/consts/other/trajectory-mo export class TrajectoryComponent implements AfterViewInit, OnInit { @Input() trajectory!: Trajectory; protected readonly dotsArray = Array; - protected readonly trajectoryMore = trajectoryMoreList; + protected readonly trajectoryMore = trajectoryMore; router = inject(Router); trajectoryService = inject(TrajectoriesService); diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.html b/projects/social_platform/src/app/office/features/news-card/news-card.component.html index 082c3ed3..0d852a75 100644 --- a/projects/social_platform/src/app/office/features/news-card/news-card.component.html +++ b/projects/social_platform/src/app/office/features/news-card/news-card.component.html @@ -7,9 +7,12 @@ [src]="feedItem.imageAddress || placeholderUrl" [alt]="feedItem.name" /> -

    - {{ feedItem.name | truncate: 30 }} -

    +
    +
    {{ feedItem.name | truncate: 30 }}
    +
    + {{ feedItem.datetimeCreated | dayjs: "format":"DD.MM.YY" }} +
    +
    @if (isOwner) {
    @@ -106,8 +109,9 @@
    -
    - {{ feedItem.datetimeCreated | dayjs: "format":"DD.MM.YY" }} +
    + + {{ feedItem.viewsCount }}
    diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss index 156a8794..bc1ba95e 100644 --- a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss +++ b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss @@ -78,6 +78,23 @@ color: var(--dark-grey); } + &__views { + display: flex; + align-items: center; + gap: 3px; + color: var(--dark-grey); + + i { + margin-bottom: 1px; + } + } + + &__right { + display: flex; + align-items: center; + gap: 5px; + } + /* stylelint-disable value-no-vendor-prefix */ &__text { color: var(--grey-for-text); diff --git a/projects/social_platform/src/app/office/projects/detail/detail.routes.ts b/projects/social_platform/src/app/office/projects/detail/detail.routes.ts index d211c2ec..ad1c499d 100644 --- a/projects/social_platform/src/app/office/projects/detail/detail.routes.ts +++ b/projects/social_platform/src/app/office/projects/detail/detail.routes.ts @@ -73,10 +73,9 @@ export const PROJECT_DETAIL_ROUTES: Routes = [ path: "kanban", canActivate: [KanbanBoardGuard], component: KanbanComponent, - resolve: { - data: KanbanBoardResolver, - }, + resolve: { data: KanbanBoardResolver }, loadChildren: () => import("./kanban/kanban.routes").then(c => c.KANBAN_ROUTES), + runGuardsAndResolvers: "always", }, { path: "chat", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/detail/kanban-detail.routes.ts b/projects/social_platform/src/app/office/projects/detail/kanban/detail/kanban-detail.routes.ts new file mode 100644 index 00000000..71b58d88 --- /dev/null +++ b/projects/social_platform/src/app/office/projects/detail/kanban/detail/kanban-detail.routes.ts @@ -0,0 +1,17 @@ +/** @format */ + +import { Routes } from "@angular/router"; +import { KanbanBoardComponent } from "../board/kanban-board.component"; +import { KanbanArhiveComponent } from "../archive/kanban-archive.component"; + +export const KANBAN_DETAIL_ROUTES: Routes = [ + { path: "", pathMatch: "full", redirectTo: "board" }, + { + path: "board", + component: KanbanBoardComponent, + }, + { + path: "archive", + component: KanbanArhiveComponent, + }, +]; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts index 6ff26fd0..728c045e 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts @@ -2,7 +2,7 @@ import { CommonModule } from "@angular/common"; import { Component, inject, OnInit, signal } from "@angular/core"; -import { RouterOutlet } from "@angular/router"; +import { RouterOutlet, ActivatedRoute } from "@angular/router"; import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; import { TaskDetailComponent } from "./shared/task/detail/task-detail.component"; import { KanbanBoardDetailInfoService } from "./services/kanban-board-detail-info.service"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts index 456b30fa..0face5e6 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts @@ -10,17 +10,15 @@ export const KanbanBoardResolver = (route: ActivatedRouteSnapshot): any => { const router = inject(Router); const projectId = Number(route.parent?.params["projectId"]); - if (!projectId) { - return of(router.createUrlTree(["/projects"])); - } + if (!projectId) return of(router.createUrlTree(["/projects"])); - // return kanbanBoardService.getBoardByProjectId(projectId).pipe( - // map((board: any) => ({ - // columns: board.columns, - // })), - // catchError((error) => { - // console.error('Error resolving Kanban board:', error); - // return of(router.createUrlTree(['/projects'])); - // }) - // ); + return kanbanBoardService.getBoardByProjectId(projectId).pipe( + map((board: any) => { + const kanbanId = board[0].id; + if (!kanbanId) return router.createUrlTree(["/projects", projectId, "work-section"]); + + return router.createUrlTree(["/projects", projectId, "kanban", kanbanId]); + }), + catchError(() => of(router.createUrlTree(["/projects"]))) + ); }; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts index 196f754f..11a881d3 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts +++ b/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts @@ -1,17 +1,10 @@ /** @format */ import { Routes } from "@angular/router"; -import { KanbanBoardComponent } from "./board/kanban-board.component"; -import { KanbanArhiveComponent } from "./archive/kanban-archive.component"; export const KANBAN_ROUTES: Routes = [ - { path: "", pathMatch: "full", redirectTo: "board" }, { - path: "board", - component: KanbanBoardComponent, - }, - { - path: "archive", - component: KanbanArhiveComponent, + path: ":kanbanId", + loadChildren: () => import("./detail/kanban-detail.routes").then(c => c.KANBAN_DETAIL_ROUTES), }, ]; From 727486ca17b55a0e797f078468a456160310695d Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 9 Dec 2025 13:49:47 +0300 Subject: [PATCH 19/22] add styles for news-card --- .../app/office/features/news-card/news-card.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss index bc1ba95e..d8a9b407 100644 --- a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss +++ b/projects/social_platform/src/app/office/features/news-card/news-card.component.scss @@ -80,8 +80,8 @@ &__views { display: flex; - align-items: center; gap: 3px; + align-items: center; color: var(--dark-grey); i { @@ -91,8 +91,8 @@ &__right { display: flex; - align-items: center; gap: 5px; + align-items: center; } /* stylelint-disable value-no-vendor-prefix */ From eb5f9c261a429eb5267dfe1218f5c9f0766c3777 Mon Sep 17 00:00:00 2001 From: Awakich Date: Thu, 11 Dec 2025 10:41:38 +0300 Subject: [PATCH 20/22] rewrite architecture to api, domain, ui --- .../navigation/nav-project-items.const.ts | 2 +- .../guards/auth}/auth-required.guard.spec.ts | 2 +- .../lib/guards/auth}/auth-required.guard.ts | 2 +- .../src/lib/guards}/kanban/kanban.guard.ts | 8 +-- .../projects-edit}/projects-edit.guard.ts | 2 +- .../bearer-token.interceptor.spec.ts | 2 +- .../src/lib/models/error}/error-code.ts | 0 .../src/lib/models/error}/error-message.ts | 0 .../src/lib}/models/http.model.ts | 0 .../{ => controls}/control-error.pipe.spec.ts | 0 .../{ => controls}/control-error.pipe.ts | 0 .../{ => controls}/form-control.pipe.spec.ts | 2 +- .../pipes/{ => controls}/form-control.pipe.ts | 0 .../pipes/{ => formatters}/capitalize.pipe.ts | 0 .../pipes/{ => formatters}/dayjs.pipe.spec.ts | 0 .../lib/pipes/{ => formatters}/dayjs.pipe.ts | 0 .../parse-breaks.pipe.spec.ts | 0 .../{ => formatters}/parse-breaks.pipe.ts | 0 .../{ => formatters}/parse-links.pipe.spec.ts | 0 .../{ => formatters}/parse-links.pipe.ts | 0 .../{ => formatters}/pluralize.pipe.spec.ts | 0 .../pipes/{ => formatters}/pluralize.pipe.ts | 0 .../pipes/{ => formatters}/truncate.pipe.ts | 0 .../years-from-birthday.pipe.spec.ts | 0 .../years-from-birthday.pipe.ts | 0 projects/core/src/lib/pipes/index.ts | 14 ++--- .../transformers}/formatted-file-size.pipe.ts | 0 .../link-transform.pipe.spec.ts | 0 .../{ => transformers}/link-transform.pipe.ts | 0 .../options-transform.pipe.ts | 0 .../salary-transform.pipe.ts | 0 .../salary-trasform.pipe.spec.ts | 0 .../lib/pipes/user}/user-links.pipe.spec.ts | 2 +- .../src/lib/pipes/user}/user-links.pipe.ts | 0 .../lib/pipes/user}/user-role.pipe.spec.ts | 4 +- .../src/lib/pipes/user}/user-role.pipe.ts | 2 +- .../services/{ => api}/api.service.spec.ts | 2 +- .../src/lib/services/{ => api}/api.service.ts | 2 +- .../services/{ => api}/skillsApi.service.ts | 3 +- .../lib/services/error}/error.service.spec.ts | 2 +- .../src/lib/services/error}/error.service.ts | 2 +- .../global-error-handler.service.spec.ts | 2 +- .../error}/global-error-handler.service.ts | 0 .../lib/services/file}/file.service.spec.ts | 4 +- .../src/lib/services/file}/file.service.ts | 0 projects/core/src/lib/services/index.ts | 10 +-- .../subscription-plans.service.ts | 4 +- .../{ => tokens}/token.service.spec.ts | 2 +- .../services/{ => tokens}/token.service.ts | 4 +- .../validation.service.spec.ts | 2 +- .../{ => validation}/validation.service.ts | 2 +- .../websockets}/websocket.service.spec.ts | 2 +- .../services/websockets}/websocket.service.ts | 0 projects/skills/src/app/app.component.ts | 2 +- .../app/profile/services/profile.service.ts | 3 +- .../advert}/advert.service.spec.ts | 2 +- .../services => api/advert}/advert.service.ts | 2 +- .../auth}/auth.service.spec.ts | 0 .../services => api/auth}/auth.service.ts | 4 +- .../app/{auth/services => api/auth}/index.ts | 0 .../auth}/profile.service.spec.ts | 0 .../services => api/auth}/profile.service.ts | 4 +- .../chat-direct}/chat-direct.service.spec.ts | 2 +- .../chat/chat-direct}/chat-direct.service.ts | 6 +- .../chat-project.service.spec.ts | 2 +- .../chat-projects}/chat-project.service.ts | 2 +- .../chat}/chat.service.spec.ts | 2 +- .../services => api/chat}/chat.service.ts | 11 ++-- .../services => api/feed}/feed.service.ts | 4 +- .../industry}/industry.service.spec.ts | 0 .../industry}/industry.service.ts | 2 +- .../invite}/invite.service.spec.ts | 2 +- .../services => api/invite}/invite.service.ts | 4 +- .../kanban}/dto/comment.model.dto.ts | 2 +- .../kanban}/dto/performer.model.dto.ts | 0 .../kanban}/dto/tag.model.dto.ts | 0 .../kanban-board-detail-info.service.ts | 8 +-- .../kanban}/kanban-board-info.service.ts | 2 +- .../kanban}/kanban-board.service.ts | 2 +- .../member}/member.service.spec.ts | 2 +- .../services => api/member}/member.service.ts | 4 +- .../onboarding}/onboarding.service.spec.ts | 4 +- .../onboarding}/onboarding.service.ts | 4 +- .../profile}/profile-date.service.ts | 4 +- .../profile}/profile-news.service.spec.ts | 0 .../profile}/profile-news.service.ts | 6 +- .../program}/program-data.service.ts | 2 +- .../program}/program-news.service.spec.ts | 2 +- .../program}/program-news.service.ts | 4 +- .../program}/program.service.spec.ts | 2 +- .../program}/program.service.ts | 12 ++-- .../project}/project-achievements.service.ts | 0 .../project}/project-additional.service.ts | 6 +- .../project}/project-contacts.service.ts | 0 .../project}/project-data.service.ts | 2 +- .../project}/project-form.service.ts | 6 +- .../project}/project-goals.service.ts | 4 +- .../project}/project-news.service.ts | 6 +- .../project}/project-partner.service.ts | 4 +- .../project}/project-rating.service.spec.ts | 0 .../project}/project-rating.service.ts | 8 +-- .../project}/project-resources.service.ts | 4 +- .../project}/project-step.service.ts | 0 .../project}/project-team.service.ts | 6 +- .../project}/project-vacancy.service.ts | 6 +- .../project}/project.service.spec.ts | 4 +- .../project}/project.service.ts | 16 ++--- .../project}/projects.service.ts | 2 +- .../services => api/skills}/skills.service.ts | 6 +- .../specializations.service.ts | 6 +- .../storage}/storage.service.ts | 0 .../subscription.service.spec.ts | 0 .../subsriptions}/subscription.service.ts | 6 +- .../vacancy}/vacancy.service.spec.ts | 0 .../vacancy}/vacancy.service.ts | 4 +- .../src/app/app.component.spec.ts | 2 +- .../social_platform/src/app/app.component.ts | 4 +- .../social_platform/src/app/app.config.ts | 2 +- .../social_platform/src/app/app.routes.ts | 8 +-- .../social_platform/src/app/core/README.md | 59 ------------------ .../models => domain/auth}/http.model.ts | 0 .../auth}/password-errors.model.ts | 0 .../models => domain/auth}/tokens.model.ts | 0 .../models => domain/auth}/user.model.ts | 8 +-- .../models => domain/chat}/chat-item.model.ts | 4 +- .../chat}/chat-message.model.ts | 2 +- .../models => domain/chat}/chat.model.ts | 2 +- .../models => domain/feed}/feed-item.model.ts | 6 +- .../models => domain/file}/file.model.ts | 0 .../industry}/industry.model.ts | 0 .../models => domain/invite}/invite.model.ts | 4 +- .../models => domain/kanban}/board.model.ts | 0 .../models => domain/kanban}/column.model.ts | 0 .../kanban}/comments.model.ts | 4 +- .../models => domain/kanban}/tag.model.ts | 0 .../models => domain/kanban}/task.model.ts | 10 +-- .../models => domain/news}/article.model.ts | 0 .../other}/api-pagination.model.ts | 0 .../other}/filter-fields.model.ts | 0 .../other}/notification.model.ts | 0 .../profile}/profile-news.model.ts | 2 +- .../program}/partner-program-fields.model.ts | 0 .../program}/program-create.model.ts | 0 .../program}/program.model.ts | 0 .../program}/programs-result.model.ts | 0 .../project}/collaborator.model.ts | 0 .../models => domain/project}/goals.model.ts | 0 .../project}/partner.model.ts | 0 .../project}/project-assign.model.ts | 0 .../project}/project-news.model.ts | 2 +- .../models => domain/project}/project-rate.ts | 0 .../project-rating-criterion-output.ts | 0 .../project}/project-rating-criterion-type.ts | 0 .../project}/project-rating-criterion.ts | 0 .../project}/project-subscriber.model.ts | 0 .../project}/project.model.ts | 7 ++- .../project}/resource.model.ts | 0 .../{office/models => domain/skills}/skill.ts | 0 .../models => domain/skills}/skills-group.ts | 0 .../specializations}/specialization.ts | 0 .../specializations}/specializations-group.ts | 2 +- .../vacancy}/vacancy-response.model.ts | 4 +- .../vacancy}/vacancy.model.ts | 4 +- .../approve-skill.component.html | 0 .../approve-skill.component.scss | 0 .../approve-skill/approve-skill.component.ts | 13 ++-- .../avatar-control.component.ts | 2 +- .../chat-message.component.spec.ts | 2 +- .../chat-message/chat-message.component.ts | 6 +- .../chat-window/chat-window.component.html | 0 .../chat-window/chat-window.component.scss | 0 .../chat-window/chat-window.component.spec.ts | 0 .../chat-window/chat-window.component.ts | 8 +-- .../context-menu/context-menu.component.html | 0 .../context-menu/context-menu.component.scss | 0 .../context-menu/context-menu.component.ts | 0 .../components}/detail/detail.component.html | 0 .../components}/detail/detail.component.scss | 0 .../components}/detail/detail.component.ts | 28 ++++----- .../components/dropdown/dropdown.component.ts | 4 +- .../feed-filter}/feed-filter.component.html | 0 .../feed-filter}/feed-filter.component.scss | 0 .../feed-filter.component.spec.ts | 0 .../feed-filter}/feed-filter.component.ts | 6 +- .../file-item/file-item.component.ts | 4 +- .../file-upload-item.component.ts | 2 +- .../info-card/info-card.component.html | 0 .../info-card/info-card.component.scss | 0 .../info-card/info-card.component.spec.ts | 2 +- .../info-card/info-card.component.ts | 8 +-- .../invite-card/invite-card.component.html | 0 .../invite-card/invite-card.component.scss | 0 .../invite-card/invite-card.component.spec.ts | 0 .../invite-card/invite-card.component.ts | 6 +- .../members-filters.component.html | 0 .../members-filters.component.scss | 0 .../members-filters.component.spec.ts | 0 .../members-filters.component.ts | 12 ++-- .../message-input.component.html | 0 .../message-input.component.scss | 0 .../message-input.component.spec.ts | 0 .../message-input/message-input.component.ts | 6 +- .../components}/nav/nav.component.html | 0 .../components}/nav/nav.component.scss | 0 .../components}/nav/nav.component.spec.ts | 2 +- .../components}/nav/nav.component.ts | 10 +-- .../news-card/news-card.component.html | 0 .../news-card/news-card.component.scss | 0 .../news-card/news-card.component.spec.ts | 0 .../news-card/news-card.component.ts | 38 +++++++++--- .../news-detail/news-detail.component.html | 0 .../news-detail/news-detail.component.scss | 0 .../news-detail/news-detail.component.spec.ts | 0 .../news-detail/news-detail.component.ts | 4 +- .../news-detail/news-detail.resolver.spec.ts | 2 +- .../news-detail/news-detail.resolver.ts | 4 +- .../news-form/news-form.component.html | 0 .../news-form/news-form.component.scss | 0 .../news-form/news-form.component.spec.ts | 0 .../news-form/news-form.component.ts | 4 +- .../program-projects-filter.component.html} | 0 .../program-projects-filter.component.scss} | 0 ...program-projects-filter.component.spec.ts} | 10 +-- .../program-projects-filter.component.ts} | 14 ++--- .../boolean-criterion.component.html | 0 .../boolean-criterion.component.scss | 0 .../boolean-criterion.component.ts | 0 .../range-criterion-input.component.html | 0 .../range-criterion-input.component.scss | 0 .../range-criterion-input.component.spec.ts | 0 .../range-criterion-input.component.ts | 0 .../project-rating.component.html | 0 .../project-rating.component.scss | 0 .../project-rating.component.ts | 4 +- .../projects-filter.component.html | 0 .../projects-filter.component.scss | 0 .../projects-filter.component.spec.ts | 0 .../projects-filter.component.ts | 2 +- .../response-card.component.html | 0 .../response-card.component.scss | 0 .../response-card.component.spec.ts | 0 .../response-card/response-card.component.ts | 11 +--- .../components/snackbar/snackbar.component.ts | 4 +- .../upload-file/upload-file.component.spec.ts | 2 +- .../upload-file/upload-file.component.ts | 2 +- .../vacancy-card/vacancy-card.component.html | 0 .../vacancy-card/vacancy-card.component.scss | 0 .../vacancy-card.component.spec.ts | 0 .../vacancy-card/vacancy-card.component.ts | 4 +- .../vacancy-filter.component.html | 0 .../vacancy-filter.component.scss | 0 .../vacancy-filter.component.spec.ts | 0 .../vacancy-filter.component.ts | 4 +- .../src/app/{ => ui/pages}/auth/README.md | 0 .../{ => ui/pages}/auth/auth.component.html | 0 .../{ => ui/pages}/auth/auth.component.scss | 0 .../pages}/auth/auth.component.spec.ts | 0 .../app/{ => ui/pages}/auth/auth.component.ts | 0 .../confirm-email.component.html | 0 .../confirm-email.component.scss | 0 .../confirm-email.component.spec.ts | 2 +- .../confirm-email/confirm-email.component.ts | 0 .../confirm-password-reset.component.html | 0 .../confirm-password-reset.component.scss | 0 .../confirm-password-reset.component.spec.ts | 0 .../confirm-password-reset.component.ts | 0 .../email-verification.component.html | 0 .../email-verification.component.scss | 0 .../email-verification.component.spec.ts | 2 +- .../email-verification.component.ts | 2 +- .../pages}/auth/login/login.component.html | 0 .../pages}/auth/login/login.component.scss | 0 .../pages}/auth/login/login.component.spec.ts | 2 +- .../pages}/auth/login/login.component.ts | 4 +- .../auth/register/register.component.html | 0 .../auth/register/register.component.scss | 0 .../auth/register/register.component.spec.ts | 2 +- .../auth/register/register.component.ts | 4 +- .../reset-password.component.html | 0 .../reset-password.component.scss | 0 .../reset-password.component.spec.ts | 0 .../reset-password.component.ts | 4 +- .../set-password/set-password.component.html | 0 .../set-password/set-password.component.scss | 0 .../set-password.component.spec.ts | 0 .../set-password/set-password.component.ts | 4 +- .../chat-direct/chat-direct.component.html | 0 .../chat-direct/chat-direct.component.scss | 0 .../chat-direct/chat-direct.component.spec.ts | 2 +- .../chat-direct/chat-direct.component.ts | 14 ++--- .../chat-direct/chat-direct.resolver.spec.ts | 2 +- .../chat}/chat-direct/chat-direct.resolver.ts | 4 +- .../pages}/chat/chat-groups.resolver.spec.ts | 0 .../pages}/chat/chat-groups.resolver.ts | 4 +- .../pages}/chat/chat.component.html | 0 .../pages}/chat/chat.component.scss | 0 .../pages}/chat/chat.component.spec.ts | 0 .../pages}/chat/chat.component.ts | 10 +-- .../pages}/chat/chat.resolver.spec.ts | 0 .../pages}/chat/chat.resolver.ts | 4 +- .../src/app/{ => ui/pages}/error/README.md | 0 .../error-code}/error-code.component.html | 0 .../error-code}/error-code.component.scss | 0 .../error-code}/error-code.component.spec.ts | 2 +- .../error/error-code}/error-code.component.ts | 0 .../{ => ui/pages}/error/error.component.html | 0 .../{ => ui/pages}/error/error.component.scss | 0 .../pages}/error/error.component.spec.ts | 0 .../{ => ui/pages}/error/error.component.ts | 0 .../not-found/error-not-found.component.html | 0 .../not-found/error-not-found.component.scss | 0 .../error-not-found.component.spec.ts | 0 .../not-found/error-not-found.component.ts | 0 .../pages}/feed/feed.component.html | 0 .../pages}/feed/feed.component.scss | 0 .../pages}/feed/feed.component.ts | 18 +++--- .../pages}/feed/feed.resolver.ts | 6 +- .../pages}/members/members.component.html | 0 .../pages}/members/members.component.scss | 0 .../pages}/members/members.component.spec.ts | 0 .../pages}/members/members.component.ts | 17 +++--- .../pages}/members/members.resolver.spec.ts | 2 +- .../pages}/members/members.resolver.ts | 6 +- .../pages}/mentors/mentors.component.html | 0 .../pages}/mentors/mentors.component.scss | 0 .../pages}/mentors/mentors.component.spec.ts | 0 .../pages}/mentors/mentors.component.ts | 14 ++--- .../pages}/mentors/mentors.resolver.spec.ts | 2 +- .../pages}/mentors/mentors.resolver.ts | 6 +- .../src/app/{ => ui/pages}/office/README.md | 0 .../pages}/office/office.component.html | 0 .../pages}/office/office.component.scss | 0 .../pages}/office/office.component.spec.ts | 4 +- .../{ => ui/pages}/office/office.component.ts | 16 ++--- .../pages}/office/office.resolver.spec.ts | 0 .../{ => ui/pages}/office/office.resolver.ts | 4 +- .../onboarding/onboarding.component.html | 0 .../onboarding/onboarding.component.scss | 0 .../onboarding/onboarding.component.spec.ts | 2 +- .../pages}/onboarding/onboarding.component.ts | 2 +- .../stage-one/stage-one.component.html | 0 .../stage-one/stage-one.component.scss | 0 .../stage-one/stage-one.component.spec.ts | 0 .../stage-one/stage-one.component.ts | 14 ++--- .../stage-one/stage-one.resolver.ts | 4 +- .../stage-three/stage-three.component.html | 0 .../stage-three/stage-three.component.scss | 0 .../stage-three/stage-three.component.spec.ts | 2 +- .../stage-three/stage-three.component.ts | 6 +- .../stage-two/stage-two.component.html | 0 .../stage-two/stage-two.component.scss | 0 .../stage-two/stage-two.component.spec.ts | 0 .../stage-two/stage-two.component.ts | 14 ++--- .../stage-two/stage-two.resolver.ts | 4 +- .../stage-zero/stage-zero.component.html | 0 .../stage-zero/stage-zero.component.scss | 0 .../stage-zero/stage-zero.component.spec.ts | 0 .../stage-zero/stage-zero.component.ts | 10 +-- .../profile/detail/main/main.component.html | 0 .../profile/detail/main/main.component.scss | 0 .../detail/main/main.component.spec.ts | 0 .../profile/detail/main/main.component.ts | 37 ++++------- .../profile/detail/main/main.resolver.ts | 2 +- .../profile/detail/profile-detail.resolver.ts | 11 ++-- .../detail/projects/projects.component.html | 0 .../detail/projects/projects.component.scss | 0 .../projects/projects.component.spec.ts | 0 .../detail/projects/projects.component.ts | 10 +-- .../pages}/profile/edit/edit.component.html | 0 .../pages}/profile/edit/edit.component.scss | 0 .../profile/edit/edit.component.spec.ts | 0 .../pages}/profile/edit/edit.component.ts | 22 +++---- .../pages}/program/detail/detail.resolver.ts | 6 +- .../program/detail/list/list-all.resolver.ts | 36 ++++++----- .../program/detail/list/list.component.html | 4 +- .../program/detail/list/list.component.scss | 0 .../detail/list/list.component.spec.ts | 0 .../program/detail/list/list.component.ts | 25 ++++---- .../program/detail/list/members.resolver.ts | 6 +- .../program/detail/list/projects.resolver.ts | 6 +- .../program/detail/main/main.component.html | 0 .../program/detail/main/main.component.scss | 0 .../detail/main/main.component.spec.ts | 0 .../program/detail/main/main.component.ts | 28 ++++----- .../detail/register/register.component.html | 0 .../detail/register/register.component.scss | 0 .../register/register.component.spec.ts | 0 .../detail/register/register.component.ts | 4 +- .../detail/register/register.resolver.spec.ts | 0 .../detail/register/register.resolver.ts | 4 +- .../pages}/program/main/main.component.html | 0 .../pages}/program/main/main.component.scss | 0 .../program/main/main.component.spec.ts | 0 .../pages}/program/main/main.component.ts | 8 +-- .../pages}/program/main/main.resolver.spec.ts | 0 .../pages}/program/main/main.resolver.ts | 6 +- .../pages}/program/program.component.html | 0 .../pages}/program/program.component.scss | 0 .../pages}/program/program.component.spec.ts | 0 .../pages}/program/program.component.ts | 4 +- .../dashboard/dashboard.component.html | 0 .../dashboard/dashboard.component.scss | 0 .../projects/dashboard/dashboard.component.ts | 4 +- .../projects/detail/chat/chat.component.html | 0 .../projects/detail/chat/chat.component.scss | 0 .../detail/chat/chat.component.spec.ts | 2 +- .../projects/detail/chat/chat.component.ts | 19 +++--- .../detail/chat/chat.resolver.spec.ts | 2 +- .../projects/detail/chat/chat.resolver.ts | 6 +- .../pages}/projects/detail/detail.resolver.ts | 10 +-- .../projects/detail/info/info.component.html | 0 .../projects/detail/info/info.component.scss | 0 .../detail/info/info.component.spec.ts | 0 .../projects/detail/info/info.component.ts | 29 +++++---- .../detail/info/info.resolver.spec.ts | 0 .../projects/detail/info/info.resolver.ts | 4 +- .../kanban-board-actions.component.html | 0 .../kanban-board-actions.component.scss | 0 .../actions/kanban-board-actions.component.ts | 2 +- .../cancel-task-form.component.html | 0 .../cancel-task-form.component.scss | 0 .../cancel-task-form.component.ts | 2 +- .../create-board-form.component.html | 0 .../create-board-form.component.scss | 0 .../create-board-form.component.ts | 2 +- .../create-tag-form.component.html | 0 .../create-tag-form.component.scss | 0 .../create-tag-form.component.ts | 2 +- .../kanban-board-sidebar.component.html | 0 .../kanban-board-sidebar.component.scss | 0 .../sidebar/kanban-board-sidebar.component.ts | 6 +- .../task/detail/task-detail.component.html | 0 .../task/detail/task-detail.component.scss | 0 .../task/detail/task-detail.component.ts | 26 ++++---- .../task/kanban-task.component.html | 0 .../task/kanban-task.component.scss | 0 .../components}/task/kanban-task.component.ts | 4 +- .../detail/kanban/kanban.component.html | 0 .../detail/kanban/kanban.component.scss | 0 .../detail/kanban/kanban.component.ts | 6 +- .../projects/detail/kanban/kanban.resolver.ts | 2 +- .../archive/kanban-archive.component.html | 0 .../archive/kanban-archive.component.scss | 0 .../archive/kanban-archive.component.ts | 6 +- .../pages}/board/kanban-board.component.html | 0 .../pages}/board/kanban-board.component.scss | 0 .../pages}/board/kanban-board.component.ts | 8 +-- .../projects/detail/team/team.component.html | 0 .../projects/detail/team/team.component.scss | 0 .../projects/detail/team/team.component.ts | 8 +-- .../detail/vacancies/vacancies.component.html | 0 .../detail/vacancies/vacancies.component.scss | 0 .../detail/vacancies/vacancies.component.ts | 5 +- .../detail/work-section/responses.resolver.ts | 4 +- .../work-section/work-section.component.html | 0 .../work-section/work-section.component.scss | 0 .../work-section/work-section.component.ts | 4 +- .../project-achievement-step.component.html | 0 .../project-achievement-step.component.scss | 0 .../project-achievement-step.component.ts | 6 +- .../project-additional-step.component.html | 0 .../project-additional-step.component.scss | 0 .../project-additional-step.component.ts | 8 +-- .../project-main-step.component.html | 0 .../project-main-step.component.scss | 0 .../project-main-step.component.ts | 14 ++--- .../project-navigation.component.html | 0 .../project-navigation.component.scss | 0 .../project-navigation.component.ts | 2 +- ...ject-partner-resources-step.component.html | 0 ...ject-partner-resources-step.component.scss | 0 ...roject-partner-resources-step.component.ts | 8 +-- .../project-team-step.component.html | 0 .../project-team-step.component.scss | 0 .../project-team-step.component.ts | 10 +-- .../project-vacancy-step.component.html | 0 .../project-vacancy-step.component.scss | 0 .../project-vacancy-step.component.ts | 10 +-- .../pages}/projects/edit/edit.component.html | 0 .../pages}/projects/edit/edit.component.scss | 0 .../projects/edit/edit.component.spec.ts | 0 .../pages}/projects/edit/edit.component.ts | 61 +++++++++---------- .../projects/edit/edit.resolver.spec.ts | 0 .../pages}/projects/edit/edit.resolver.ts | 14 ++--- .../pages}/projects/list/all.resolver.spec.ts | 2 +- .../pages}/projects/list/all.resolver.ts | 6 +- .../pages}/projects/list/invites.resolver.ts | 4 +- .../pages}/projects/list/list.component.html | 0 .../pages}/projects/list/list.component.scss | 0 .../projects/list/list.component.spec.ts | 0 .../pages}/projects/list/list.component.ts | 16 ++--- .../pages}/projects/list/my.resolver.spec.ts | 2 +- .../pages}/projects/list/my.resolver.ts | 6 +- .../projects/list/subscriptions.resolver.ts | 6 +- .../pages}/projects/projects.component.html | 0 .../pages}/projects/projects.component.scss | 0 .../projects/projects.component.spec.ts | 0 .../pages}/projects/projects.component.ts | 12 ++-- .../pages}/projects/projects.resolver.spec.ts | 0 .../pages}/projects/projects.resolver.ts | 10 +-- .../vacancies/detail/info/info.component.html | 0 .../vacancies/detail/info/info.component.scss | 0 .../detail/info/info.component.spec.ts | 0 .../vacancies/detail/info/info.component.ts | 26 +++----- .../detail/vacancies-detail.component.html | 0 .../detail/vacancies-detail.component.scss | 0 .../detail/vacancies-detail.component.spec.ts | 0 .../detail/vacancies-detail.component.ts | 2 +- .../detail/vacancies-detail.resolver.ts | 2 +- .../pages}/vacancies/list/list.component.html | 0 .../pages}/vacancies/list/list.component.scss | 0 .../vacancies/list/list.component.spec.ts | 0 .../pages}/vacancies/list/list.component.ts | 12 ++-- .../pages}/vacancies/list/my.resolver.ts | 4 +- .../pages}/vacancies/vacancies.component.html | 0 .../pages}/vacancies/vacancies.component.scss | 0 .../vacancies/vacancies.component.spec.ts | 0 .../pages}/vacancies/vacancies.component.ts | 2 +- .../pages}/vacancies/vacancies.resolver.ts | 2 +- .../app/{ => ui/routes}/auth/auth.routes.ts | 16 ++--- .../routes/chat}/chat-direct.routes.ts | 4 +- .../{office => ui/routes}/chat/chat.routes.ts | 8 +-- .../app/{ => ui/routes}/error/error.routes.ts | 6 +- .../{office => ui/routes}/feed/feed.routes.ts | 4 +- .../routes/kanban}/kanban-detail.routes.ts | 4 +- .../routes}/kanban/kanban.routes.ts | 2 +- .../{ => ui/routes}/office/office.routes.ts | 24 ++++---- .../routes}/onboarding/onboarding.routes.ts | 14 ++--- .../routes/profile}/profile-detail.routes.ts | 12 ++-- .../routes/program}/detail.routes.ts | 16 ++--- .../routes}/program/program.routes.ts | 8 +-- .../routes/projects}/detail.routes.ts | 32 +++++----- .../routes}/projects/projects.routes.ts | 24 ++++---- .../list => ui/routes/vacancy}/list.routes.ts | 4 +- .../vacancy}/vacancies-detail.routes.ts | 6 +- .../routes/vacancy}/vacancies.routes.ts | 11 ++-- .../{ => animation}/animation.service.spec.ts | 2 +- .../{ => animation}/animation.service.ts | 0 .../services/loading}/loading.service.ts | 0 .../services/nav}/nav.service.spec.ts | 2 +- .../services/nav}/nav.service.ts | 0 .../notification.service.spec.ts | 0 .../notification}/notification.service.ts | 2 +- .../{ => snackbar}/snackbar.service.spec.ts | 2 +- .../{ => snackbar}/snackbar.service.ts | 0 .../advert-card/advert-card.component.html | 0 .../advert-card/advert-card.component.scss | 0 .../advert-card/advert-card.component.spec.ts | 0 .../advert-card/advert-card.component.ts | 2 +- .../approve-skill-people.component.html | 0 .../approve-skill-people.component.scss | 0 .../approve-skill-people.component.ts | 2 +- .../shared/carousel/carousel.component.html | 0 .../shared/carousel/carousel.component.scss | 0 .../carousel/carousel.component.spec.ts | 0 .../shared/carousel/carousel.component.ts | 2 +- .../shared/chat-card/chat-card.component.html | 0 .../shared/chat-card/chat-card.component.scss | 0 .../shared/chat-card/chat-card.component.ts | 4 +- .../closed-vacancy.component.html | 0 .../closed-vacancy.component.scss | 0 .../closed-vacancy.component.spec.ts | 0 .../closed-vacancy.component.ts | 0 .../collaborator-card.component.html | 0 .../collaborator-card.component.scss | 0 .../collaborator-card.component.spec.ts | 0 .../collaborator-card.component.ts | 8 +-- .../dashboardItem.component.html | 0 .../dashboardItem.component.scss | 0 .../dashboardItem/dashboardItem.component.ts | 6 +- .../shared/header/header.component.html | 0 .../shared/header/header.component.scss | 0 .../shared/header/header.component.spec.ts | 0 .../shared/header/header.component.ts | 8 +-- .../shared/img-card/img-card.component.html | 0 .../shared/img-card/img-card.component.scss | 0 .../img-card/img-card.component.spec.ts | 0 .../shared/img-card/img-card.component.ts | 0 .../shared/link-card/link-card.component.html | 0 .../shared/link-card/link-card.component.scss | 0 .../link-card/link-card.component.spec.ts | 0 .../shared/link-card/link-card.component.ts | 2 +- .../new-project/new-project.component.html | 0 .../new-project/new-project.component.scss | 0 .../new-project/new-project.component.ts | 6 +- .../open-vacancy/open-vacancy.component.html | 0 .../open-vacancy/open-vacancy.component.scss | 0 .../open-vacancy/open-vacancy.component.ts | 8 +-- .../profile-news/profile-news.component.html | 0 .../profile-news/profile-news.component.scss | 0 .../profile-news.component.spec.ts | 0 .../profile-news/profile-news.component.ts | 8 ++- .../program-card/program-card.component.html | 0 .../program-card/program-card.component.scss | 0 .../program-card.component.spec.ts | 0 .../program-card/program-card.component.ts | 2 +- .../project-direction-card.component.html | 0 .../project-direction-card.component.scss | 0 .../project-direction-card.component.ts | 12 ++-- .../project-member-card.component.html | 0 .../project-member-card.component.scss | 0 .../project-member-card.component.spec.ts | 0 .../project-member-card.component.ts | 2 +- .../project-vacancy-card.component.html | 0 .../project-vacancy-card.component.scss | 0 .../project-vacancy-card.component.spec.ts | 0 .../project-vacancy-card.component.ts | 4 +- .../rating-card/rating-card.component.html | 0 .../rating-card/rating-card.component.scss | 0 .../rating-card/rating-card.component.spec.ts | 0 .../rating-card/rating-card.component.ts | 14 ++--- .../skills-basket.component.html | 0 .../skills-basket.component.scss | 0 .../skills-basket.component.spec.ts | 0 .../skills-basket/skills-basket.component.ts | 2 +- .../skills-group/skills-group.component.html | 0 .../skills-group/skills-group.component.scss | 0 .../skills-group.component.spec.ts | 0 .../skills-group/skills-group.component.ts | 2 +- .../shared/soon-card/soon-card.component.html | 0 .../shared/soon-card/soon-card.component.scss | 0 .../shared/soon-card/soon-card.component.ts | 0 .../specializations-group.component.html | 0 .../specializations-group.component.scss | 0 .../specializations-group.component.spec.ts | 0 .../specializations-group.component.ts | 2 +- .../user-type-card.component.html | 0 .../user-type-card.component.scss | 0 .../user-type-card.component.spec.ts | 0 .../user-type-card.component.ts | 0 .../src/app/utils/calculateProgress.ts | 2 +- .../app/utils/helpers/dashboardItemBuilder.ts | 2 +- .../utils/helpers/inviteToProjectMapper.ts | 2 +- .../invite-manage-card.component.ts | 4 +- .../profile-control-panel.component.ts | 2 +- 635 files changed, 881 insertions(+), 941 deletions(-) rename projects/{social_platform/src/app/auth/guards => core/src/lib/guards/auth}/auth-required.guard.spec.ts (91%) rename projects/{social_platform/src/app/auth/guards => core/src/lib/guards/auth}/auth-required.guard.ts (95%) rename projects/{social_platform/src/app/office/projects/detail => core/src/lib/guards}/kanban/kanban.guard.ts (75%) rename projects/{social_platform/src/app/office/projects/edit/guards => core/src/lib/guards/projects-edit}/projects-edit.guard.ts (90%) rename projects/{social_platform/src/app/error/models => core/src/lib/models/error}/error-code.ts (100%) rename projects/{social_platform/src/app/error/models => core/src/lib/models/error}/error-message.ts (100%) rename projects/{social_platform/src/app/core => core/src/lib}/models/http.model.ts (100%) rename projects/core/src/lib/pipes/{ => controls}/control-error.pipe.spec.ts (100%) rename projects/core/src/lib/pipes/{ => controls}/control-error.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => controls}/form-control.pipe.spec.ts (75%) rename projects/core/src/lib/pipes/{ => controls}/form-control.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/capitalize.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/dayjs.pipe.spec.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/dayjs.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/parse-breaks.pipe.spec.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/parse-breaks.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/parse-links.pipe.spec.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/parse-links.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/pluralize.pipe.spec.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/pluralize.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/truncate.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/years-from-birthday.pipe.spec.ts (100%) rename projects/core/src/lib/pipes/{ => formatters}/years-from-birthday.pipe.ts (100%) rename projects/{social_platform/src/app/core/pipes => core/src/lib/pipes/transformers}/formatted-file-size.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => transformers}/link-transform.pipe.spec.ts (100%) rename projects/core/src/lib/pipes/{ => transformers}/link-transform.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => transformers}/options-transform.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => transformers}/salary-transform.pipe.ts (100%) rename projects/core/src/lib/pipes/{ => transformers}/salary-trasform.pipe.spec.ts (100%) rename projects/{social_platform/src/app/core/pipes => core/src/lib/pipes/user}/user-links.pipe.spec.ts (76%) rename projects/{social_platform/src/app/core/pipes => core/src/lib/pipes/user}/user-links.pipe.ts (100%) rename projects/{social_platform/src/app/core/pipes => core/src/lib/pipes/user}/user-role.pipe.spec.ts (68%) rename projects/{social_platform/src/app/core/pipes => core/src/lib/pipes/user}/user-role.pipe.ts (93%) rename projects/core/src/lib/services/{ => api}/api.service.spec.ts (91%) rename projects/core/src/lib/services/{ => api}/api.service.ts (99%) rename projects/core/src/lib/services/{ => api}/skillsApi.service.ts (96%) rename projects/{social_platform/src/app/error/services => core/src/lib/services/error}/error.service.spec.ts (89%) rename projects/{social_platform/src/app/error/services => core/src/lib/services/error}/error.service.ts (97%) rename projects/{social_platform/src/app/error/services => core/src/lib/services/error}/global-error-handler.service.spec.ts (86%) rename projects/{social_platform/src/app/error/services => core/src/lib/services/error}/global-error-handler.service.ts (100%) rename projects/{social_platform/src/app/core/services => core/src/lib/services/file}/file.service.spec.ts (82%) rename projects/{social_platform/src/app/core/services => core/src/lib/services/file}/file.service.ts (100%) rename projects/core/src/lib/services/{ => subscriptions}/subscription-plans.service.ts (96%) rename projects/core/src/lib/services/{ => tokens}/token.service.spec.ts (86%) rename projects/core/src/lib/services/{ => tokens}/token.service.ts (96%) rename projects/core/src/lib/services/{ => validation}/validation.service.spec.ts (85%) rename projects/core/src/lib/services/{ => validation}/validation.service.ts (99%) rename projects/{social_platform/src/app/core/services => core/src/lib/services/websockets}/websocket.service.spec.ts (85%) rename projects/{social_platform/src/app/core/services => core/src/lib/services/websockets}/websocket.service.ts (100%) rename projects/social_platform/src/app/{office/services => api/advert}/advert.service.spec.ts (100%) rename projects/social_platform/src/app/{office/services => api/advert}/advert.service.ts (96%) rename projects/social_platform/src/app/{auth/services => api/auth}/auth.service.spec.ts (100%) rename projects/social_platform/src/app/{auth/services => api/auth}/auth.service.ts (98%) rename projects/social_platform/src/app/{auth/services => api/auth}/index.ts (100%) rename projects/social_platform/src/app/{auth/services => api/auth}/profile.service.spec.ts (100%) rename projects/social_platform/src/app/{auth/services => api/auth}/profile.service.ts (95%) rename projects/social_platform/src/app/{office/chat/services => api/chat/chat-direct}/chat-direct.service.spec.ts (84%) rename projects/social_platform/src/app/{office/chat/services => api/chat/chat-direct}/chat-direct.service.ts (90%) rename projects/social_platform/src/app/{office/chat/services => api/chat/chat-projects}/chat-project.service.spec.ts (84%) rename projects/social_platform/src/app/{office/chat/services => api/chat/chat-projects}/chat-project.service.ts (93%) rename projects/social_platform/src/app/{office/services => api/chat}/chat.service.spec.ts (90%) rename projects/social_platform/src/app/{office/services => api/chat}/chat.service.ts (96%) rename projects/social_platform/src/app/{office/feed/services => api/feed}/feed.service.ts (95%) rename projects/social_platform/src/app/{office/services => api/industry}/industry.service.spec.ts (100%) rename projects/social_platform/src/app/{office/services => api/industry}/industry.service.ts (97%) rename projects/social_platform/src/app/{office/services => api/invite}/invite.service.spec.ts (90%) rename projects/social_platform/src/app/{office/services => api/invite}/invite.service.ts (97%) rename projects/social_platform/src/app/{office/projects/detail/kanban/models => api/kanban}/dto/comment.model.dto.ts (63%) rename projects/social_platform/src/app/{office/projects/detail/kanban/models => api/kanban}/dto/performer.model.dto.ts (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/models => api/kanban}/dto/tag.model.dto.ts (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/services => api/kanban}/kanban-board-detail-info.service.ts (94%) rename projects/social_platform/src/app/{office/projects/detail/kanban/services => api/kanban}/kanban-board-info.service.ts (96%) rename projects/social_platform/src/app/{office/projects/detail/kanban/services => api/kanban}/kanban-board.service.ts (91%) rename projects/social_platform/src/app/{office/services => api/member}/member.service.spec.ts (91%) rename projects/social_platform/src/app/{office/services => api/member}/member.service.ts (94%) rename projects/social_platform/src/app/{office/onboarding/services => api/onboarding}/onboarding.service.spec.ts (92%) rename projects/social_platform/src/app/{office/onboarding/services => api/onboarding}/onboarding.service.ts (96%) rename projects/social_platform/src/app/{office/profile/detail/services => api/profile}/profile-date.service.ts (89%) rename projects/social_platform/src/app/{office/profile/detail/services => api/profile}/profile-news.service.spec.ts (100%) rename projects/social_platform/src/app/{office/profile/detail/services => api/profile}/profile-news.service.ts (96%) rename projects/social_platform/src/app/{office/program/services => api/program}/program-data.service.ts (91%) rename projects/social_platform/src/app/{office/program/services => api/program}/program-news.service.spec.ts (83%) rename projects/social_platform/src/app/{office/program/services => api/program}/program-news.service.ts (94%) rename projects/social_platform/src/app/{office/program/services => api/program}/program.service.spec.ts (87%) rename projects/social_platform/src/app/{office/program/services => api/program}/program.service.ts (90%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-achievements.service.ts (100%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-additional.service.ts (97%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-contacts.service.ts (100%) rename projects/social_platform/src/app/{office/projects/detail/services => api/project}/project-data.service.ts (89%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-form.service.ts (97%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-goals.service.ts (98%) rename projects/social_platform/src/app/{office/projects/detail/services => api/project}/project-news.service.ts (96%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-partner.service.ts (98%) rename projects/social_platform/src/app/{office/program/services => api/project}/project-rating.service.spec.ts (100%) rename projects/social_platform/src/app/{office/program/services => api/project}/project-rating.service.ts (92%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-resources.service.ts (98%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-step.service.ts (100%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-team.service.ts (96%) rename projects/social_platform/src/app/{office/projects/edit/services => api/project}/project-vacancy.service.ts (98%) rename projects/social_platform/src/app/{office/services => api/project}/project.service.spec.ts (93%) rename projects/social_platform/src/app/{office/services => api/project}/project.service.ts (95%) rename projects/social_platform/src/app/{office/projects/services => api/project}/projects.service.ts (89%) rename projects/social_platform/src/app/{office/services => api/skills}/skills.service.ts (91%) rename projects/social_platform/src/app/{office/services => api/specializations}/specializations.service.ts (90%) rename projects/social_platform/src/app/{office/services => api/storage}/storage.service.ts (100%) rename projects/social_platform/src/app/{office/services => api/subsriptions}/subscription.service.spec.ts (100%) rename projects/social_platform/src/app/{office/services => api/subsriptions}/subscription.service.ts (93%) rename projects/social_platform/src/app/{office/services => api/vacancy}/vacancy.service.spec.ts (100%) rename projects/social_platform/src/app/{office/services => api/vacancy}/vacancy.service.ts (97%) delete mode 100644 projects/social_platform/src/app/core/README.md rename projects/social_platform/src/app/{auth/models => domain/auth}/http.model.ts (100%) rename projects/social_platform/src/app/{auth/models => domain/auth}/password-errors.model.ts (100%) rename projects/social_platform/src/app/{auth/models => domain/auth}/tokens.model.ts (100%) rename projects/social_platform/src/app/{auth/models => domain/auth}/user.model.ts (95%) rename projects/social_platform/src/app/{office/chat/models => domain/chat}/chat-item.model.ts (91%) rename projects/social_platform/src/app/{office/models => domain/chat}/chat-message.model.ts (97%) rename projects/social_platform/src/app/{office/models => domain/chat}/chat.model.ts (97%) rename projects/social_platform/src/app/{office/feed/models => domain/feed}/feed-item.model.ts (93%) rename projects/social_platform/src/app/{office/models => domain/file}/file.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/industry}/industry.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/invite}/invite.model.ts (84%) rename projects/social_platform/src/app/{office/projects/detail/kanban/models => domain/kanban}/board.model.ts (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/models => domain/kanban}/column.model.ts (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/models => domain/kanban}/comments.model.ts (68%) rename projects/social_platform/src/app/{office/models => domain/kanban}/tag.model.ts (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/models => domain/kanban}/task.model.ts (77%) rename projects/social_platform/src/app/{office/models => domain/news}/article.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/other}/api-pagination.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/other}/filter-fields.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/other}/notification.model.ts (100%) rename projects/social_platform/src/app/{office/profile/detail/models => domain/profile}/profile-news.model.ts (96%) rename projects/social_platform/src/app/{office/models => domain/program}/partner-program-fields.model.ts (100%) rename projects/social_platform/src/app/{office/program/models => domain/program}/program-create.model.ts (100%) rename projects/social_platform/src/app/{office/program/models => domain/program}/program.model.ts (100%) rename projects/social_platform/src/app/{office/program/models => domain/program}/programs-result.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/project}/collaborator.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/project}/goals.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/project}/partner.model.ts (100%) rename projects/social_platform/src/app/{office/projects/models => domain/project}/project-assign.model.ts (100%) rename projects/social_platform/src/app/{office/projects/models => domain/project}/project-news.model.ts (96%) rename projects/social_platform/src/app/{office/program/models => domain/project}/project-rate.ts (100%) rename projects/social_platform/src/app/{office/program/models => domain/project}/project-rating-criterion-output.ts (100%) rename projects/social_platform/src/app/{office/program/models => domain/project}/project-rating-criterion-type.ts (100%) rename projects/social_platform/src/app/{office/program/models => domain/project}/project-rating-criterion.ts (100%) rename projects/social_platform/src/app/{office/models => domain/project}/project-subscriber.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/project}/project.model.ts (94%) rename projects/social_platform/src/app/{office/models => domain/project}/resource.model.ts (100%) rename projects/social_platform/src/app/{office/models => domain/skills}/skill.ts (100%) rename projects/social_platform/src/app/{office/models => domain/skills}/skills-group.ts (100%) rename projects/social_platform/src/app/{office/models => domain/specializations}/specialization.ts (100%) rename projects/social_platform/src/app/{office/models => domain/specializations}/specializations-group.ts (89%) rename projects/social_platform/src/app/{office/models => domain/vacancy}/vacancy-response.model.ts (83%) rename projects/social_platform/src/app/{office/models => domain/vacancy}/vacancy.model.ts (90%) rename projects/social_platform/src/app/{office/features => ui/components}/approve-skill/approve-skill.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/approve-skill/approve-skill.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/approve-skill/approve-skill.component.ts (89%) rename projects/social_platform/src/app/{office/features => ui/components}/chat-window/chat-window.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/chat-window/chat-window.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/chat-window/chat-window.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/chat-window/chat-window.component.ts (97%) rename projects/social_platform/src/app/{office/features => ui/components}/context-menu/context-menu.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/context-menu/context-menu.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/context-menu/context-menu.component.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/detail/detail.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/detail/detail.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/detail/detail.component.ts (93%) rename projects/social_platform/src/app/{office/feed/filter => ui/components/feed-filter}/feed-filter.component.html (100%) rename projects/social_platform/src/app/{office/feed/filter => ui/components/feed-filter}/feed-filter.component.scss (100%) rename projects/social_platform/src/app/{office/feed/filter => ui/components/feed-filter}/feed-filter.component.spec.ts (100%) rename projects/social_platform/src/app/{office/feed/filter => ui/components/feed-filter}/feed-filter.component.ts (97%) rename projects/social_platform/src/app/{office/features => ui/components}/info-card/info-card.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/info-card/info-card.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/info-card/info-card.component.spec.ts (89%) rename projects/social_platform/src/app/{office/features => ui/components}/info-card/info-card.component.ts (94%) rename projects/social_platform/src/app/{office/features => ui/components}/invite-card/invite-card.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/invite-card/invite-card.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/invite-card/invite-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/invite-card/invite-card.component.ts (93%) rename projects/social_platform/src/app/{office/members/filters => ui/components/members-filters}/members-filters.component.html (100%) rename projects/social_platform/src/app/{office/members/filters => ui/components/members-filters}/members-filters.component.scss (100%) rename projects/social_platform/src/app/{office/members/filters => ui/components/members-filters}/members-filters.component.spec.ts (100%) rename projects/social_platform/src/app/{office/members/filters => ui/components/members-filters}/members-filters.component.ts (92%) rename projects/social_platform/src/app/{office/features => ui/components}/message-input/message-input.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/message-input/message-input.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/message-input/message-input.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/message-input/message-input.component.ts (97%) rename projects/social_platform/src/app/{office/features => ui/components}/nav/nav.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/nav/nav.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/nav/nav.component.spec.ts (91%) rename projects/social_platform/src/app/{office/features => ui/components}/nav/nav.component.ts (93%) rename projects/social_platform/src/app/{office/features => ui/components}/news-card/news-card.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/news-card/news-card.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/news-card/news-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/news-card/news-card.component.ts (89%) rename projects/social_platform/src/app/{office/projects/detail => ui/components}/news-detail/news-detail.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail => ui/components}/news-detail/news-detail.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail => ui/components}/news-detail/news-detail.component.spec.ts (100%) rename projects/social_platform/src/app/{office/projects/detail => ui/components}/news-detail/news-detail.component.ts (95%) rename projects/social_platform/src/app/{office/projects/detail => ui/components}/news-detail/news-detail.resolver.spec.ts (92%) rename projects/social_platform/src/app/{office/projects/detail => ui/components}/news-detail/news-detail.resolver.ts (93%) rename projects/social_platform/src/app/{office/features => ui/components}/news-form/news-form.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/news-form/news-form.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/news-form/news-form.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/news-form/news-form.component.ts (97%) rename projects/social_platform/src/app/{office/program/detail/list/projects-filter/projects-filter.component.html => ui/components/program-projects-filter/program-projects-filter.component.html} (100%) rename projects/social_platform/src/app/{office/program/detail/list/projects-filter/projects-filter.component.scss => ui/components/program-projects-filter/program-projects-filter.component.scss} (100%) rename projects/social_platform/src/app/{office/projects/projects-filter/projects-filter.component.spec.ts => ui/components/program-projects-filter/program-projects-filter.component.spec.ts} (62%) rename projects/social_platform/src/app/{office/program/detail/list/projects-filter/projects-filter.component.ts => ui/components/program-projects-filter/program-projects-filter.component.ts} (94%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/components/boolean-criterion/boolean-criterion.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/components/boolean-criterion/boolean-criterion.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/components/boolean-criterion/boolean-criterion.component.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/components/range-criterion-input/range-criterion-input.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/components/range-criterion-input/range-criterion-input.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/components/range-criterion-input/range-criterion-input.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/components/range-criterion-input/range-criterion-input.component.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/project-rating.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/project-rating.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/project-rating/project-rating.component.ts (97%) rename projects/social_platform/src/app/{office/projects => ui/components}/projects-filter/projects-filter.component.html (100%) rename projects/social_platform/src/app/{office/projects => ui/components}/projects-filter/projects-filter.component.scss (100%) rename projects/social_platform/src/app/{office/program/detail/list => ui/components}/projects-filter/projects-filter.component.spec.ts (100%) rename projects/social_platform/src/app/{office/projects => ui/components}/projects-filter/projects-filter.component.ts (98%) rename projects/social_platform/src/app/{office/features => ui/components}/response-card/response-card.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/response-card/response-card.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/response-card/response-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/response-card/response-card.component.ts (81%) rename projects/social_platform/src/app/{office/features => ui/components}/vacancy-card/vacancy-card.component.html (100%) rename projects/social_platform/src/app/{office/features => ui/components}/vacancy-card/vacancy-card.component.scss (100%) rename projects/social_platform/src/app/{office/features => ui/components}/vacancy-card/vacancy-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/features => ui/components}/vacancy-card/vacancy-card.component.ts (93%) rename projects/social_platform/src/app/{office/vacancies/shared/filter => ui/components/vacancy-filter}/vacancy-filter.component.html (100%) rename projects/social_platform/src/app/{office/vacancies/shared/filter => ui/components/vacancy-filter}/vacancy-filter.component.scss (100%) rename projects/social_platform/src/app/{office/vacancies/shared/filter => ui/components/vacancy-filter}/vacancy-filter.component.spec.ts (100%) rename projects/social_platform/src/app/{office/vacancies/shared/filter => ui/components/vacancy-filter}/vacancy-filter.component.ts (98%) rename projects/social_platform/src/app/{ => ui/pages}/auth/README.md (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/auth.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/auth.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/auth.component.spec.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/auth.component.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-email/confirm-email.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-email/confirm-email.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-email/confirm-email.component.spec.ts (94%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-email/confirm-email.component.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-password-reset/confirm-password-reset.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-password-reset/confirm-password-reset.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-password-reset/confirm-password-reset.component.spec.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/confirm-password-reset/confirm-password-reset.component.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/email-verification/email-verification.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/email-verification/email-verification.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/email-verification/email-verification.component.spec.ts (94%) rename projects/social_platform/src/app/{ => ui/pages}/auth/email-verification/email-verification.component.ts (96%) rename projects/social_platform/src/app/{ => ui/pages}/auth/login/login.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/login/login.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/login/login.component.spec.ts (95%) rename projects/social_platform/src/app/{ => ui/pages}/auth/login/login.component.ts (96%) rename projects/social_platform/src/app/{ => ui/pages}/auth/register/register.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/register/register.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/register/register.component.spec.ts (95%) rename projects/social_platform/src/app/{ => ui/pages}/auth/register/register.component.ts (97%) rename projects/social_platform/src/app/{ => ui/pages}/auth/reset-password/reset-password.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/reset-password/reset-password.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/reset-password/reset-password.component.spec.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/reset-password/reset-password.component.ts (94%) rename projects/social_platform/src/app/{ => ui/pages}/auth/set-password/set-password.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/set-password/set-password.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/set-password/set-password.component.spec.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/auth/set-password/set-password.component.ts (95%) rename projects/social_platform/src/app/{office/chat/chat-direct => ui/pages/chat}/chat-direct/chat-direct.component.html (100%) rename projects/social_platform/src/app/{office/chat/chat-direct => ui/pages/chat}/chat-direct/chat-direct.component.scss (100%) rename projects/social_platform/src/app/{office/chat/chat-direct => ui/pages/chat}/chat-direct/chat-direct.component.spec.ts (93%) rename projects/social_platform/src/app/{office/chat/chat-direct => ui/pages/chat}/chat-direct/chat-direct.component.ts (93%) rename projects/social_platform/src/app/{office/chat/chat-direct => ui/pages/chat}/chat-direct/chat-direct.resolver.spec.ts (90%) rename projects/social_platform/src/app/{office/chat/chat-direct => ui/pages/chat}/chat-direct/chat-direct.resolver.ts (83%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat-groups.resolver.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat-groups.resolver.ts (81%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat.component.ts (91%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat.resolver.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/chat/chat.resolver.ts (80%) rename projects/social_platform/src/app/{ => ui/pages}/error/README.md (100%) rename projects/social_platform/src/app/{error/code => ui/pages/error/error-code}/error-code.component.html (100%) rename projects/social_platform/src/app/{error/code => ui/pages/error/error-code}/error-code.component.scss (100%) rename projects/social_platform/src/app/{error/code => ui/pages/error/error-code}/error-code.component.spec.ts (89%) rename projects/social_platform/src/app/{error/code => ui/pages/error/error-code}/error-code.component.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/error.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/error.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/error.component.spec.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/error.component.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/not-found/error-not-found.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/not-found/error-not-found.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/not-found/error-not-found.component.spec.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/error/not-found/error-not-found.component.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/feed/feed.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/feed/feed.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/feed/feed.component.ts (90%) rename projects/social_platform/src/app/{office => ui/pages}/feed/feed.resolver.ts (86%) rename projects/social_platform/src/app/{office => ui/pages}/members/members.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/members/members.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/members/members.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/members/members.component.ts (95%) rename projects/social_platform/src/app/{office => ui/pages}/members/members.resolver.spec.ts (89%) rename projects/social_platform/src/app/{office => ui/pages}/members/members.resolver.ts (83%) rename projects/social_platform/src/app/{office => ui/pages}/mentors/mentors.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/mentors/mentors.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/mentors/mentors.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/mentors/mentors.component.ts (91%) rename projects/social_platform/src/app/{office => ui/pages}/mentors/mentors.resolver.spec.ts (88%) rename projects/social_platform/src/app/{office => ui/pages}/mentors/mentors.resolver.ts (87%) rename projects/social_platform/src/app/{ => ui/pages}/office/README.md (100%) rename projects/social_platform/src/app/{ => ui/pages}/office/office.component.html (100%) rename projects/social_platform/src/app/{ => ui/pages}/office/office.component.scss (100%) rename projects/social_platform/src/app/{ => ui/pages}/office/office.component.spec.ts (85%) rename projects/social_platform/src/app/{ => ui/pages}/office/office.component.ts (90%) rename projects/social_platform/src/app/{ => ui/pages}/office/office.resolver.spec.ts (100%) rename projects/social_platform/src/app/{ => ui/pages}/office/office.resolver.ts (79%) rename projects/social_platform/src/app/{office/onboarding => ui/pages}/onboarding/onboarding.component.html (100%) rename projects/social_platform/src/app/{office/onboarding => ui/pages}/onboarding/onboarding.component.scss (100%) rename projects/social_platform/src/app/{office/onboarding => ui/pages}/onboarding/onboarding.component.spec.ts (92%) rename projects/social_platform/src/app/{office/onboarding => ui/pages}/onboarding/onboarding.component.ts (98%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-one/stage-one.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-one/stage-one.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-one/stage-one.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-one/stage-one.component.ts (91%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-one/stage-one.resolver.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-three/stage-three.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-three/stage-three.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-three/stage-three.component.spec.ts (93%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-three/stage-three.component.ts (92%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-two/stage-two.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-two/stage-two.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-two/stage-two.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-two/stage-two.component.ts (93%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-two/stage-two.resolver.ts (91%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-zero/stage-zero.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-zero/stage-zero.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-zero/stage-zero.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/onboarding/stage-zero/stage-zero.component.ts (98%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/main/main.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/main/main.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/main/main.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/main/main.component.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/main/main.resolver.ts (94%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/profile-detail.resolver.ts (82%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/projects/projects.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/projects/projects.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/projects/projects.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/detail/projects/projects.component.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/profile/edit/edit.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/edit/edit.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/edit/edit.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/profile/edit/edit.component.ts (97%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/detail.resolver.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/list/list-all.resolver.ts (72%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/list/list.component.html (95%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/list/list.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/list/list.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/list/list.component.ts (93%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/list/members.resolver.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/list/projects.resolver.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/main/main.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/main/main.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/main/main.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/main/main.component.ts (89%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/register/register.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/register/register.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/register/register.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/register/register.component.ts (95%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/register/register.resolver.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/detail/register/register.resolver.ts (90%) rename projects/social_platform/src/app/{office => ui/pages}/program/main/main.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/main/main.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/main/main.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/main/main.component.ts (94%) rename projects/social_platform/src/app/{office => ui/pages}/program/main/main.resolver.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/main/main.resolver.ts (85%) rename projects/social_platform/src/app/{office => ui/pages}/program/program.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/program.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/program.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/program/program.component.ts (96%) rename projects/social_platform/src/app/{office => ui/pages}/projects/dashboard/dashboard.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/dashboard/dashboard.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/dashboard/dashboard.component.ts (89%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/chat/chat.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/chat/chat.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/chat/chat.component.spec.ts (92%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/chat/chat.component.ts (93%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/chat/chat.resolver.spec.ts (89%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/chat/chat.resolver.ts (78%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/detail.resolver.ts (72%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/info/info.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/info/info.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/info/info.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/info/info.component.ts (90%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/info/info.resolver.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/info/info.resolver.ts (91%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/actions/kanban-board-actions.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/actions/kanban-board-actions.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/actions/kanban-board-actions.component.ts (87%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/cancel-task-form/cancel-task-form.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/cancel-task-form/cancel-task-form.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/cancel-task-form/cancel-task-form.component.ts (95%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/create-board-form/create-board-form.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/create-board-form/create-board-form.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/create-board-form/create-board-form.component.ts (95%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/create-tag-form/create-tag-form.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/create-tag-form/create-tag-form.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/create-tag-form/create-tag-form.component.ts (97%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/sidebar/kanban-board-sidebar.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/sidebar/kanban-board-sidebar.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/sidebar/kanban-board-sidebar.component.ts (92%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/task/detail/task-detail.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/task/detail/task-detail.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/task/detail/task-detail.component.ts (95%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/task/kanban-task.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/task/kanban-task.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban/shared => ui/pages/projects/detail/kanban/components}/task/kanban-task.component.ts (89%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/kanban/kanban.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/kanban/kanban.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/kanban/kanban.component.ts (80%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/kanban/kanban.resolver.ts (90%) rename projects/social_platform/src/app/{office/projects/detail/kanban => ui/pages/projects/detail/kanban/pages}/archive/kanban-archive.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban => ui/pages/projects/detail/kanban/pages}/archive/kanban-archive.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban => ui/pages/projects/detail/kanban/pages}/archive/kanban-archive.component.ts (90%) rename projects/social_platform/src/app/{office/projects/detail/kanban => ui/pages/projects/detail/kanban/pages}/board/kanban-board.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban => ui/pages/projects/detail/kanban/pages}/board/kanban-board.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail/kanban => ui/pages/projects/detail/kanban/pages}/board/kanban-board.component.ts (95%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/team/team.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/team/team.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/team/team.component.ts (85%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/vacancies/vacancies.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/vacancies/vacancies.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/vacancies/vacancies.component.ts (82%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/work-section/responses.resolver.ts (80%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/work-section/work-section.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/work-section/work-section.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/detail/work-section/work-section.component.ts (91%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-achievement-step/project-achievement-step.component.html (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-achievement-step/project-achievement-step.component.scss (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-achievement-step/project-achievement-step.component.ts (93%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-additional-step/project-additional-step.component.html (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-additional-step/project-additional-step.component.scss (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-additional-step/project-additional-step.component.ts (90%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-main-step/project-main-step.component.html (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-main-step/project-main-step.component.scss (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-main-step/project-main-step.component.ts (93%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-navigation/project-navigation.component.html (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-navigation/project-navigation.component.scss (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-navigation/project-navigation.component.ts (89%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-partner-resources-step/project-partner-resources-step.component.html (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-partner-resources-step/project-partner-resources-step.component.scss (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-partner-resources-step/project-partner-resources-step.component.ts (92%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-team-step/project-team-step.component.html (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-team-step/project-team-step.component.scss (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-team-step/project-team-step.component.ts (91%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-vacancy-step/project-vacancy-step.component.html (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-vacancy-step/project-vacancy-step.component.scss (100%) rename projects/social_platform/src/app/{office/projects/edit/shared => ui/pages/projects/edit/components}/project-vacancy-step/project-vacancy-step.component.ts (91%) rename projects/social_platform/src/app/{office => ui/pages}/projects/edit/edit.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/edit/edit.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/edit/edit.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/edit/edit.component.ts (88%) rename projects/social_platform/src/app/{office => ui/pages}/projects/edit/edit.resolver.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/edit/edit.resolver.ts (75%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/all.resolver.spec.ts (88%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/all.resolver.ts (88%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/invites.resolver.ts (80%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/list.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/list.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/list.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/list.component.ts (94%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/my.resolver.spec.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/my.resolver.ts (89%) rename projects/social_platform/src/app/{office => ui/pages}/projects/list/subscriptions.resolver.ts (91%) rename projects/social_platform/src/app/{office => ui/pages}/projects/projects.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/projects.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/projects.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/projects.component.ts (92%) rename projects/social_platform/src/app/{office => ui/pages}/projects/projects.resolver.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/projects/projects.resolver.ts (82%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/info/info.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/info/info.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/info/info.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/info/info.component.ts (91%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/vacancies-detail.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/vacancies-detail.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/vacancies-detail.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/vacancies-detail.component.ts (96%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/detail/vacancies-detail.resolver.ts (93%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/list/list.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/list/list.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/list/list.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/list/list.component.ts (89%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/list/my.resolver.ts (87%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/vacancies.component.html (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/vacancies.component.scss (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/vacancies.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/vacancies.component.ts (95%) rename projects/social_platform/src/app/{office => ui/pages}/vacancies/vacancies.resolver.ts (90%) rename projects/social_platform/src/app/{ => ui/routes}/auth/auth.routes.ts (68%) rename projects/social_platform/src/app/{office/chat/chat-direct => ui/routes/chat}/chat-direct.routes.ts (80%) rename projects/social_platform/src/app/{office => ui/routes}/chat/chat.routes.ts (73%) rename projects/social_platform/src/app/{ => ui/routes}/error/error.routes.ts (85%) rename projects/social_platform/src/app/{office => ui/routes}/feed/feed.routes.ts (94%) rename projects/social_platform/src/app/{office/projects/detail/kanban/detail => ui/routes/kanban}/kanban-detail.routes.ts (57%) rename projects/social_platform/src/app/{office/projects/detail => ui/routes}/kanban/kanban.routes.ts (57%) rename projects/social_platform/src/app/{ => ui/routes}/office/office.routes.ts (58%) rename projects/social_platform/src/app/{office => ui/routes}/onboarding/onboarding.routes.ts (74%) rename projects/social_platform/src/app/{office/profile/detail => ui/routes/profile}/profile-detail.routes.ts (76%) rename projects/social_platform/src/app/{office/program/detail => ui/routes/program}/detail.routes.ts (70%) rename projects/social_platform/src/app/{office => ui/routes}/program/program.routes.ts (78%) rename projects/social_platform/src/app/{office/projects/detail => ui/routes/projects}/detail.routes.ts (58%) rename projects/social_platform/src/app/{office => ui/routes}/projects/projects.routes.ts (72%) rename projects/social_platform/src/app/{office/vacancies/list => ui/routes/vacancy}/list.routes.ts (88%) rename projects/social_platform/src/app/{office/vacancies/detail => ui/routes/vacancy}/vacancies-detail.routes.ts (81%) rename projects/social_platform/src/app/{office/vacancies => ui/routes/vacancy}/vacancies.routes.ts (76%) rename projects/social_platform/src/app/ui/services/{ => animation}/animation.service.spec.ts (85%) rename projects/social_platform/src/app/ui/services/{ => animation}/animation.service.ts (100%) rename projects/social_platform/src/app/{office/services => ui/services/loading}/loading.service.ts (100%) rename projects/social_platform/src/app/{office/services => ui/services/nav}/nav.service.spec.ts (87%) rename projects/social_platform/src/app/{office/services => ui/services/nav}/nav.service.ts (100%) rename projects/social_platform/src/app/{office/services => ui/services/notification}/notification.service.spec.ts (100%) rename projects/social_platform/src/app/{office/services => ui/services/notification}/notification.service.ts (94%) rename projects/social_platform/src/app/ui/services/{ => snackbar}/snackbar.service.spec.ts (85%) rename projects/social_platform/src/app/ui/services/{ => snackbar}/snackbar.service.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/advert-card/advert-card.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/advert-card/advert-card.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/advert-card/advert-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/advert-card/advert-card.component.ts (94%) rename projects/social_platform/src/app/{office => ui}/shared/approve-skill-people/approve-skill-people.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/approve-skill-people/approve-skill-people.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/approve-skill-people/approve-skill-people.component.ts (91%) rename projects/social_platform/src/app/{office => ui}/shared/carousel/carousel.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/carousel/carousel.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/carousel/carousel.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/carousel/carousel.component.ts (97%) rename projects/social_platform/src/app/{office/chat => ui}/shared/chat-card/chat-card.component.html (100%) rename projects/social_platform/src/app/{office/chat => ui}/shared/chat-card/chat-card.component.scss (100%) rename projects/social_platform/src/app/{office/chat => ui}/shared/chat-card/chat-card.component.ts (94%) rename projects/social_platform/src/app/{office/feed => ui}/shared/closed-vacancy/closed-vacancy.component.html (100%) rename projects/social_platform/src/app/{office/feed => ui}/shared/closed-vacancy/closed-vacancy.component.scss (100%) rename projects/social_platform/src/app/{office/feed => ui}/shared/closed-vacancy/closed-vacancy.component.spec.ts (100%) rename projects/social_platform/src/app/{office/feed => ui}/shared/closed-vacancy/closed-vacancy.component.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/collaborator-card/collaborator-card.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/collaborator-card/collaborator-card.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/collaborator-card/collaborator-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/collaborator-card/collaborator-card.component.ts (85%) rename projects/social_platform/src/app/{office/projects/dashboard => ui}/shared/dashboardItem/dashboardItem.component.html (100%) rename projects/social_platform/src/app/{office/projects/dashboard => ui}/shared/dashboardItem/dashboardItem.component.scss (100%) rename projects/social_platform/src/app/{office/projects/dashboard => ui}/shared/dashboardItem/dashboardItem.component.ts (83%) rename projects/social_platform/src/app/{office => ui}/shared/header/header.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/header/header.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/header/header.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/header/header.component.ts (93%) rename projects/social_platform/src/app/{office => ui}/shared/img-card/img-card.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/img-card/img-card.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/img-card/img-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/img-card/img-card.component.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/link-card/link-card.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/link-card/link-card.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/link-card/link-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/link-card/link-card.component.ts (96%) rename projects/social_platform/src/app/{office/feed => ui}/shared/new-project/new-project.component.html (100%) rename projects/social_platform/src/app/{office/feed => ui}/shared/new-project/new-project.component.scss (100%) rename projects/social_platform/src/app/{office/feed => ui}/shared/new-project/new-project.component.ts (90%) rename projects/social_platform/src/app/{office/feed => ui}/shared/open-vacancy/open-vacancy.component.html (100%) rename projects/social_platform/src/app/{office/feed => ui}/shared/open-vacancy/open-vacancy.component.scss (100%) rename projects/social_platform/src/app/{office/feed => ui}/shared/open-vacancy/open-vacancy.component.ts (93%) rename projects/social_platform/src/app/{office/profile => ui/shared}/profile-news/profile-news.component.html (100%) rename projects/social_platform/src/app/{office/profile => ui/shared}/profile-news/profile-news.component.scss (100%) rename projects/social_platform/src/app/{office/profile => ui/shared}/profile-news/profile-news.component.spec.ts (100%) rename projects/social_platform/src/app/{office/profile => ui/shared}/profile-news/profile-news.component.ts (94%) rename projects/social_platform/src/app/{office/program => ui}/shared/program-card/program-card.component.html (100%) rename projects/social_platform/src/app/{office/program => ui}/shared/program-card/program-card.component.scss (100%) rename projects/social_platform/src/app/{office/program => ui}/shared/program-card/program-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/program => ui}/shared/program-card/program-card.component.ts (96%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-direction-card/project-direction-card.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-direction-card/project-direction-card.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-direction-card/project-direction-card.component.ts (92%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-member-card/project-member-card.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-member-card/project-member-card.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-member-card/project-member-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-member-card/project-member-card.component.ts (97%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-vacancy-card/project-vacancy-card.component.html (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-vacancy-card/project-vacancy-card.component.scss (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-vacancy-card/project-vacancy-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/projects/detail => ui}/shared/project-vacancy-card/project-vacancy-card.component.ts (94%) rename projects/social_platform/src/app/{office/program => ui}/shared/rating-card/rating-card.component.html (100%) rename projects/social_platform/src/app/{office/program => ui}/shared/rating-card/rating-card.component.scss (100%) rename projects/social_platform/src/app/{office/program => ui}/shared/rating-card/rating-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/program => ui}/shared/rating-card/rating-card.component.ts (96%) rename projects/social_platform/src/app/{office => ui}/shared/skills-basket/skills-basket.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/skills-basket/skills-basket.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/skills-basket/skills-basket.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/skills-basket/skills-basket.component.ts (98%) rename projects/social_platform/src/app/{office => ui}/shared/skills-group/skills-group.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/skills-group/skills-group.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/skills-group/skills-group.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/skills-group/skills-group.component.ts (98%) rename projects/social_platform/src/app/{office => ui}/shared/soon-card/soon-card.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/soon-card/soon-card.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/soon-card/soon-card.component.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/specializations-group/specializations-group.component.html (100%) rename projects/social_platform/src/app/{office => ui}/shared/specializations-group/specializations-group.component.scss (100%) rename projects/social_platform/src/app/{office => ui}/shared/specializations-group/specializations-group.component.spec.ts (100%) rename projects/social_platform/src/app/{office => ui}/shared/specializations-group/specializations-group.component.ts (96%) rename projects/social_platform/src/app/{office/onboarding => ui/shared}/user-type-card/user-type-card.component.html (100%) rename projects/social_platform/src/app/{office/onboarding => ui/shared}/user-type-card/user-type-card.component.scss (100%) rename projects/social_platform/src/app/{office/onboarding => ui/shared}/user-type-card/user-type-card.component.spec.ts (100%) rename projects/social_platform/src/app/{office/onboarding => ui/shared}/user-type-card/user-type-card.component.ts (100%) diff --git a/projects/core/src/consts/navigation/nav-project-items.const.ts b/projects/core/src/consts/navigation/nav-project-items.const.ts index 21f82b8d..0f6ada4b 100644 --- a/projects/core/src/consts/navigation/nav-project-items.const.ts +++ b/projects/core/src/consts/navigation/nav-project-items.const.ts @@ -1,6 +1,6 @@ /** @format */ -import { EditStep } from "@office/projects/edit/services/project-step.service"; +import { EditStep } from "projects/social_platform/src/app/api/project/project-step.service"; /** * Элементы навигации для редактирования проекта diff --git a/projects/social_platform/src/app/auth/guards/auth-required.guard.spec.ts b/projects/core/src/lib/guards/auth/auth-required.guard.spec.ts similarity index 91% rename from projects/social_platform/src/app/auth/guards/auth-required.guard.spec.ts rename to projects/core/src/lib/guards/auth/auth-required.guard.spec.ts index 1e85d53f..c5d59ed3 100644 --- a/projects/social_platform/src/app/auth/guards/auth-required.guard.spec.ts +++ b/projects/core/src/lib/guards/auth/auth-required.guard.spec.ts @@ -4,9 +4,9 @@ import { TestBed } from "@angular/core/testing"; import { AuthRequiredGuard } from "./auth-required.guard"; import { RouterTestingModule } from "@angular/router/testing"; -import { AuthService } from "../services"; import { of } from "rxjs"; import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; describe("AuthRequiredGuard", () => { beforeEach(() => { diff --git a/projects/social_platform/src/app/auth/guards/auth-required.guard.ts b/projects/core/src/lib/guards/auth/auth-required.guard.ts similarity index 95% rename from projects/social_platform/src/app/auth/guards/auth-required.guard.ts rename to projects/core/src/lib/guards/auth/auth-required.guard.ts index 74b3e87b..bd956edd 100644 --- a/projects/social_platform/src/app/auth/guards/auth-required.guard.ts +++ b/projects/core/src/lib/guards/auth/auth-required.guard.ts @@ -2,9 +2,9 @@ import { inject } from "@angular/core"; import { CanActivateFn, Router } from "@angular/router"; -import { AuthService } from "../services"; import { catchError, map } from "rxjs"; import { TokenService } from "@corelib"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * Guard для проверки аутентификации пользователя diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.guard.ts b/projects/core/src/lib/guards/kanban/kanban.guard.ts similarity index 75% rename from projects/social_platform/src/app/office/projects/detail/kanban/kanban.guard.ts rename to projects/core/src/lib/guards/kanban/kanban.guard.ts index a2c87c6e..b2ccbd9c 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.guard.ts +++ b/projects/core/src/lib/guards/kanban/kanban.guard.ts @@ -2,11 +2,11 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivateFn, Router, UrlTree } from "@angular/router"; -import { User } from "@auth/models/user.model"; -import { AuthService } from "@auth/services"; -import { Collaborator } from "@office/models/collaborator.model"; -import { ProjectService } from "@office/services/project.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { catchError, map, Observable, of, switchMap } from "rxjs"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; export const KanbanBoardGuard: CanActivateFn = ( route: ActivatedRouteSnapshot diff --git a/projects/social_platform/src/app/office/projects/edit/guards/projects-edit.guard.ts b/projects/core/src/lib/guards/projects-edit/projects-edit.guard.ts similarity index 90% rename from projects/social_platform/src/app/office/projects/edit/guards/projects-edit.guard.ts rename to projects/core/src/lib/guards/projects-edit/projects-edit.guard.ts index 6f800c12..6f1e52b6 100644 --- a/projects/social_platform/src/app/office/projects/edit/guards/projects-edit.guard.ts +++ b/projects/core/src/lib/guards/projects-edit/projects-edit.guard.ts @@ -4,7 +4,7 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivateFn, Router, UrlTree } from "@angular/router"; import { Observable, of } from "rxjs"; import { catchError, map } from "rxjs/operators"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; export const ProjectEditRequiredGuard: CanActivateFn = ( route: ActivatedRouteSnapshot diff --git a/projects/core/src/lib/interceptors/bearer-token.interceptor.spec.ts b/projects/core/src/lib/interceptors/bearer-token.interceptor.spec.ts index 64d44930..e98b62c7 100644 --- a/projects/core/src/lib/interceptors/bearer-token.interceptor.spec.ts +++ b/projects/core/src/lib/interceptors/bearer-token.interceptor.spec.ts @@ -3,9 +3,9 @@ import { TestBed } from "@angular/core/testing"; import { BearerTokenInterceptor } from "./bearer-token.interceptor"; -import { AuthService } from "@auth/services"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { RouterTestingModule } from "@angular/router/testing"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; describe("BearerTokenInterceptor", () => { beforeEach(() => { diff --git a/projects/social_platform/src/app/error/models/error-code.ts b/projects/core/src/lib/models/error/error-code.ts similarity index 100% rename from projects/social_platform/src/app/error/models/error-code.ts rename to projects/core/src/lib/models/error/error-code.ts diff --git a/projects/social_platform/src/app/error/models/error-message.ts b/projects/core/src/lib/models/error/error-message.ts similarity index 100% rename from projects/social_platform/src/app/error/models/error-message.ts rename to projects/core/src/lib/models/error/error-message.ts diff --git a/projects/social_platform/src/app/core/models/http.model.ts b/projects/core/src/lib/models/http.model.ts similarity index 100% rename from projects/social_platform/src/app/core/models/http.model.ts rename to projects/core/src/lib/models/http.model.ts diff --git a/projects/core/src/lib/pipes/control-error.pipe.spec.ts b/projects/core/src/lib/pipes/controls/control-error.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/control-error.pipe.spec.ts rename to projects/core/src/lib/pipes/controls/control-error.pipe.spec.ts diff --git a/projects/core/src/lib/pipes/control-error.pipe.ts b/projects/core/src/lib/pipes/controls/control-error.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/control-error.pipe.ts rename to projects/core/src/lib/pipes/controls/control-error.pipe.ts diff --git a/projects/core/src/lib/pipes/form-control.pipe.spec.ts b/projects/core/src/lib/pipes/controls/form-control.pipe.spec.ts similarity index 75% rename from projects/core/src/lib/pipes/form-control.pipe.spec.ts rename to projects/core/src/lib/pipes/controls/form-control.pipe.spec.ts index 2331b5d6..4b5b7dba 100644 --- a/projects/core/src/lib/pipes/form-control.pipe.spec.ts +++ b/projects/core/src/lib/pipes/controls/form-control.pipe.spec.ts @@ -1,6 +1,6 @@ /** @format */ -import { FormControlPipe } from "./form-control.pipe"; +import { FormControlPipe } from "../form-control.pipe"; describe("FormControlPipe", () => { it("create an instance", () => { diff --git a/projects/core/src/lib/pipes/form-control.pipe.ts b/projects/core/src/lib/pipes/controls/form-control.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/form-control.pipe.ts rename to projects/core/src/lib/pipes/controls/form-control.pipe.ts diff --git a/projects/core/src/lib/pipes/capitalize.pipe.ts b/projects/core/src/lib/pipes/formatters/capitalize.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/capitalize.pipe.ts rename to projects/core/src/lib/pipes/formatters/capitalize.pipe.ts diff --git a/projects/core/src/lib/pipes/dayjs.pipe.spec.ts b/projects/core/src/lib/pipes/formatters/dayjs.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/dayjs.pipe.spec.ts rename to projects/core/src/lib/pipes/formatters/dayjs.pipe.spec.ts diff --git a/projects/core/src/lib/pipes/dayjs.pipe.ts b/projects/core/src/lib/pipes/formatters/dayjs.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/dayjs.pipe.ts rename to projects/core/src/lib/pipes/formatters/dayjs.pipe.ts diff --git a/projects/core/src/lib/pipes/parse-breaks.pipe.spec.ts b/projects/core/src/lib/pipes/formatters/parse-breaks.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/parse-breaks.pipe.spec.ts rename to projects/core/src/lib/pipes/formatters/parse-breaks.pipe.spec.ts diff --git a/projects/core/src/lib/pipes/parse-breaks.pipe.ts b/projects/core/src/lib/pipes/formatters/parse-breaks.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/parse-breaks.pipe.ts rename to projects/core/src/lib/pipes/formatters/parse-breaks.pipe.ts diff --git a/projects/core/src/lib/pipes/parse-links.pipe.spec.ts b/projects/core/src/lib/pipes/formatters/parse-links.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/parse-links.pipe.spec.ts rename to projects/core/src/lib/pipes/formatters/parse-links.pipe.spec.ts diff --git a/projects/core/src/lib/pipes/parse-links.pipe.ts b/projects/core/src/lib/pipes/formatters/parse-links.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/parse-links.pipe.ts rename to projects/core/src/lib/pipes/formatters/parse-links.pipe.ts diff --git a/projects/core/src/lib/pipes/pluralize.pipe.spec.ts b/projects/core/src/lib/pipes/formatters/pluralize.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/pluralize.pipe.spec.ts rename to projects/core/src/lib/pipes/formatters/pluralize.pipe.spec.ts diff --git a/projects/core/src/lib/pipes/pluralize.pipe.ts b/projects/core/src/lib/pipes/formatters/pluralize.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/pluralize.pipe.ts rename to projects/core/src/lib/pipes/formatters/pluralize.pipe.ts diff --git a/projects/core/src/lib/pipes/truncate.pipe.ts b/projects/core/src/lib/pipes/formatters/truncate.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/truncate.pipe.ts rename to projects/core/src/lib/pipes/formatters/truncate.pipe.ts diff --git a/projects/core/src/lib/pipes/years-from-birthday.pipe.spec.ts b/projects/core/src/lib/pipes/formatters/years-from-birthday.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/years-from-birthday.pipe.spec.ts rename to projects/core/src/lib/pipes/formatters/years-from-birthday.pipe.spec.ts diff --git a/projects/core/src/lib/pipes/years-from-birthday.pipe.ts b/projects/core/src/lib/pipes/formatters/years-from-birthday.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/years-from-birthday.pipe.ts rename to projects/core/src/lib/pipes/formatters/years-from-birthday.pipe.ts diff --git a/projects/core/src/lib/pipes/index.ts b/projects/core/src/lib/pipes/index.ts index ce32a725..2b887919 100644 --- a/projects/core/src/lib/pipes/index.ts +++ b/projects/core/src/lib/pipes/index.ts @@ -1,9 +1,9 @@ /** @format */ -export * from "./control-error.pipe"; -export * from "./dayjs.pipe"; -export * from "./form-control.pipe"; -export * from "./parse-breaks.pipe"; -export * from "./parse-links.pipe"; -export * from "./pluralize.pipe"; -export * from "./years-from-birthday.pipe"; +export * from "./controls/control-error.pipe"; +export * from "./formatters/dayjs.pipe"; +export * from "./controls/form-control.pipe"; +export * from "./formatters/parse-breaks.pipe"; +export * from "./formatters/parse-links.pipe"; +export * from "./formatters/pluralize.pipe"; +export * from "./formatters/years-from-birthday.pipe"; diff --git a/projects/social_platform/src/app/core/pipes/formatted-file-size.pipe.ts b/projects/core/src/lib/pipes/transformers/formatted-file-size.pipe.ts similarity index 100% rename from projects/social_platform/src/app/core/pipes/formatted-file-size.pipe.ts rename to projects/core/src/lib/pipes/transformers/formatted-file-size.pipe.ts diff --git a/projects/core/src/lib/pipes/link-transform.pipe.spec.ts b/projects/core/src/lib/pipes/transformers/link-transform.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/link-transform.pipe.spec.ts rename to projects/core/src/lib/pipes/transformers/link-transform.pipe.spec.ts diff --git a/projects/core/src/lib/pipes/link-transform.pipe.ts b/projects/core/src/lib/pipes/transformers/link-transform.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/link-transform.pipe.ts rename to projects/core/src/lib/pipes/transformers/link-transform.pipe.ts diff --git a/projects/core/src/lib/pipes/options-transform.pipe.ts b/projects/core/src/lib/pipes/transformers/options-transform.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/options-transform.pipe.ts rename to projects/core/src/lib/pipes/transformers/options-transform.pipe.ts diff --git a/projects/core/src/lib/pipes/salary-transform.pipe.ts b/projects/core/src/lib/pipes/transformers/salary-transform.pipe.ts similarity index 100% rename from projects/core/src/lib/pipes/salary-transform.pipe.ts rename to projects/core/src/lib/pipes/transformers/salary-transform.pipe.ts diff --git a/projects/core/src/lib/pipes/salary-trasform.pipe.spec.ts b/projects/core/src/lib/pipes/transformers/salary-trasform.pipe.spec.ts similarity index 100% rename from projects/core/src/lib/pipes/salary-trasform.pipe.spec.ts rename to projects/core/src/lib/pipes/transformers/salary-trasform.pipe.spec.ts diff --git a/projects/social_platform/src/app/core/pipes/user-links.pipe.spec.ts b/projects/core/src/lib/pipes/user/user-links.pipe.spec.ts similarity index 76% rename from projects/social_platform/src/app/core/pipes/user-links.pipe.spec.ts rename to projects/core/src/lib/pipes/user/user-links.pipe.spec.ts index 7c485f56..423e0703 100644 --- a/projects/social_platform/src/app/core/pipes/user-links.pipe.spec.ts +++ b/projects/core/src/lib/pipes/user/user-links.pipe.spec.ts @@ -1,6 +1,6 @@ /** @format */ -import { UserLinksPipe } from "./user-links.pipe"; +import { UserLinksPipe } from "../user-links.pipe"; describe("UserLinksPipe", () => { it("create an instance", () => { diff --git a/projects/social_platform/src/app/core/pipes/user-links.pipe.ts b/projects/core/src/lib/pipes/user/user-links.pipe.ts similarity index 100% rename from projects/social_platform/src/app/core/pipes/user-links.pipe.ts rename to projects/core/src/lib/pipes/user/user-links.pipe.ts diff --git a/projects/social_platform/src/app/core/pipes/user-role.pipe.spec.ts b/projects/core/src/lib/pipes/user/user-role.pipe.spec.ts similarity index 68% rename from projects/social_platform/src/app/core/pipes/user-role.pipe.spec.ts rename to projects/core/src/lib/pipes/user/user-role.pipe.spec.ts index 1bda7006..aa9989c7 100644 --- a/projects/social_platform/src/app/core/pipes/user-role.pipe.spec.ts +++ b/projects/core/src/lib/pipes/user/user-role.pipe.spec.ts @@ -1,7 +1,7 @@ /** @format */ -import { UserRolePipe } from "./user-role.pipe"; -import { AuthService } from "@auth/services"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { UserRolePipe } from "../user-role.pipe"; import { of } from "rxjs"; describe("UserRolePipe", () => { diff --git a/projects/social_platform/src/app/core/pipes/user-role.pipe.ts b/projects/core/src/lib/pipes/user/user-role.pipe.ts similarity index 93% rename from projects/social_platform/src/app/core/pipes/user-role.pipe.ts rename to projects/core/src/lib/pipes/user/user-role.pipe.ts index 6e0111b8..8d08e40c 100644 --- a/projects/social_platform/src/app/core/pipes/user-role.pipe.ts +++ b/projects/core/src/lib/pipes/user/user-role.pipe.ts @@ -1,7 +1,7 @@ /** @format */ import { Pipe, PipeTransform } from "@angular/core"; -import { AuthService } from "@auth/services"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; import { map, Observable } from "rxjs"; /** diff --git a/projects/core/src/lib/services/api.service.spec.ts b/projects/core/src/lib/services/api/api.service.spec.ts similarity index 91% rename from projects/core/src/lib/services/api.service.spec.ts rename to projects/core/src/lib/services/api/api.service.spec.ts index a81f5e22..4404d850 100644 --- a/projects/core/src/lib/services/api.service.spec.ts +++ b/projects/core/src/lib/services/api/api.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ApiService } from "./api.service"; +import { ApiService } from "../api.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; describe("ApiService", () => { diff --git a/projects/core/src/lib/services/api.service.ts b/projects/core/src/lib/services/api/api.service.ts similarity index 99% rename from projects/core/src/lib/services/api.service.ts rename to projects/core/src/lib/services/api/api.service.ts index 20b7b93f..405bb4ce 100644 --- a/projects/core/src/lib/services/api.service.ts +++ b/projects/core/src/lib/services/api/api.service.ts @@ -3,7 +3,7 @@ import { Inject, Injectable } from "@angular/core"; import { HttpClient, HttpParams } from "@angular/common/http"; import { first, Observable } from "rxjs"; -import { API_URL } from "../providers"; +import { API_URL } from "../../providers"; /** * Базовый сервис для работы с REST API diff --git a/projects/core/src/lib/services/skillsApi.service.ts b/projects/core/src/lib/services/api/skillsApi.service.ts similarity index 96% rename from projects/core/src/lib/services/skillsApi.service.ts rename to projects/core/src/lib/services/api/skillsApi.service.ts index 00cf8e2b..b1f53364 100644 --- a/projects/core/src/lib/services/skillsApi.service.ts +++ b/projects/core/src/lib/services/api/skillsApi.service.ts @@ -2,8 +2,7 @@ import { Inject, Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; -import { ApiService } from "./api.service"; -import { SKILLS_API_URL } from "@corelib"; +import { ApiService, SKILLS_API_URL } from "@corelib"; /** * Специализированный API сервис для работы с Skills API diff --git a/projects/social_platform/src/app/error/services/error.service.spec.ts b/projects/core/src/lib/services/error/error.service.spec.ts similarity index 89% rename from projects/social_platform/src/app/error/services/error.service.spec.ts rename to projects/core/src/lib/services/error/error.service.spec.ts index 800e55b8..d1647d4e 100644 --- a/projects/social_platform/src/app/error/services/error.service.spec.ts +++ b/projects/core/src/lib/services/error/error.service.spec.ts @@ -2,8 +2,8 @@ import { TestBed } from "@angular/core/testing"; -import { ErrorService } from "./error.service"; import { RouterTestingModule } from "@angular/router/testing"; +import { ErrorService } from "../error.service"; describe("ErrorService", () => { let service: ErrorService; diff --git a/projects/social_platform/src/app/error/services/error.service.ts b/projects/core/src/lib/services/error/error.service.ts similarity index 97% rename from projects/social_platform/src/app/error/services/error.service.ts rename to projects/core/src/lib/services/error/error.service.ts index be5e7df7..482725bc 100644 --- a/projects/social_platform/src/app/error/services/error.service.ts +++ b/projects/core/src/lib/services/error/error.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { Router } from "@angular/router"; -import { ErrorCode } from "../models/error-code"; +import { ErrorCode } from "../../models/error/error-code"; /** * Сервис для обработки и навигации к страницам ошибок diff --git a/projects/social_platform/src/app/error/services/global-error-handler.service.spec.ts b/projects/core/src/lib/services/error/global-error-handler.service.spec.ts similarity index 86% rename from projects/social_platform/src/app/error/services/global-error-handler.service.spec.ts rename to projects/core/src/lib/services/error/global-error-handler.service.spec.ts index 2cccdb02..512de645 100644 --- a/projects/social_platform/src/app/error/services/global-error-handler.service.spec.ts +++ b/projects/core/src/lib/services/error/global-error-handler.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { GlobalErrorHandlerService } from "./global-error-handler.service"; +import { GlobalErrorHandlerService } from "../global-error-handler.service"; import { RouterTestingModule } from "@angular/router/testing"; describe("GlobalErrorHandlerService", () => { diff --git a/projects/social_platform/src/app/error/services/global-error-handler.service.ts b/projects/core/src/lib/services/error/global-error-handler.service.ts similarity index 100% rename from projects/social_platform/src/app/error/services/global-error-handler.service.ts rename to projects/core/src/lib/services/error/global-error-handler.service.ts diff --git a/projects/social_platform/src/app/core/services/file.service.spec.ts b/projects/core/src/lib/services/file/file.service.spec.ts similarity index 82% rename from projects/social_platform/src/app/core/services/file.service.spec.ts rename to projects/core/src/lib/services/file/file.service.spec.ts index 61c3ef1c..eaa29c47 100644 --- a/projects/social_platform/src/app/core/services/file.service.spec.ts +++ b/projects/core/src/lib/services/file/file.service.spec.ts @@ -2,9 +2,9 @@ import { TestBed } from "@angular/core/testing"; -import { FileService } from "./file.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; -import { AuthService } from "@auth/services"; +import { FileService } from "../file.service"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; describe("FileService", () => { let service: FileService; diff --git a/projects/social_platform/src/app/core/services/file.service.ts b/projects/core/src/lib/services/file/file.service.ts similarity index 100% rename from projects/social_platform/src/app/core/services/file.service.ts rename to projects/core/src/lib/services/file/file.service.ts diff --git a/projects/core/src/lib/services/index.ts b/projects/core/src/lib/services/index.ts index 538be53f..7975c4f1 100644 --- a/projects/core/src/lib/services/index.ts +++ b/projects/core/src/lib/services/index.ts @@ -1,8 +1,8 @@ /** @format */ -export * from "./api.service"; -export * from "./skillsApi.service"; -export * from "./subscription-plans.service"; -export * from "./token.service"; +export * from "./api/api.service"; +export * from "./api/skillsApi.service"; +export * from "./subscriptions/subscription-plans.service"; +export * from "./tokens/token.service"; export * from "./yt-extract.service"; -export * from "./validation.service"; +export * from "./validation/validation.service"; diff --git a/projects/core/src/lib/services/subscription-plans.service.ts b/projects/core/src/lib/services/subscriptions/subscription-plans.service.ts similarity index 96% rename from projects/core/src/lib/services/subscription-plans.service.ts rename to projects/core/src/lib/services/subscriptions/subscription-plans.service.ts index 632901ba..6ef87a43 100644 --- a/projects/core/src/lib/services/subscription-plans.service.ts +++ b/projects/core/src/lib/services/subscriptions/subscription-plans.service.ts @@ -1,8 +1,8 @@ /** @format */ import { Injectable, inject } from "@angular/core"; -import { SkillsApiService } from "@corelib"; -import { PaymentStatus, SubscriptionPlan } from "../models"; +import { PaymentStatus, SubscriptionPlan } from "../../models"; +import { SkillsApiService } from "../api/skillsApi.service"; /** * Сервис для управления планами подписок и платежами diff --git a/projects/core/src/lib/services/token.service.spec.ts b/projects/core/src/lib/services/tokens/token.service.spec.ts similarity index 86% rename from projects/core/src/lib/services/token.service.spec.ts rename to projects/core/src/lib/services/tokens/token.service.spec.ts index 976f0081..0b3001c0 100644 --- a/projects/core/src/lib/services/token.service.spec.ts +++ b/projects/core/src/lib/services/tokens/token.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { TokenService } from "./token.service"; +import { TokenService } from "../token.service"; describe("TokenService", () => { let service: TokenService; diff --git a/projects/core/src/lib/services/token.service.ts b/projects/core/src/lib/services/tokens/token.service.ts similarity index 96% rename from projects/core/src/lib/services/token.service.ts rename to projects/core/src/lib/services/tokens/token.service.ts index 06f74b0e..e2d9e72f 100644 --- a/projects/core/src/lib/services/token.service.ts +++ b/projects/core/src/lib/services/tokens/token.service.ts @@ -2,9 +2,9 @@ import { Inject, Injectable } from "@angular/core"; import { map, Observable } from "rxjs"; -import { RefreshResponse } from "@auth/models/http.model"; +import { RefreshResponse } from "projects/social_platform/src/app/domain/auth/http.model"; import { plainToInstance } from "class-transformer"; -import { Tokens } from "@auth/models/tokens.model"; +import { Tokens } from "projects/social_platform/src/app/domain/auth/tokens.model"; import Cookies, { CookieAttributes } from "js-cookie"; import { ApiService, PRODUCTION } from "@corelib"; diff --git a/projects/core/src/lib/services/validation.service.spec.ts b/projects/core/src/lib/services/validation/validation.service.spec.ts similarity index 85% rename from projects/core/src/lib/services/validation.service.spec.ts rename to projects/core/src/lib/services/validation/validation.service.spec.ts index 9a6fa19d..615a127a 100644 --- a/projects/core/src/lib/services/validation.service.spec.ts +++ b/projects/core/src/lib/services/validation/validation.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ValidationService } from "./validation.service"; +import { ValidationService } from "../validation.service"; describe("ValidationService", () => { let service: ValidationService; diff --git a/projects/core/src/lib/services/validation.service.ts b/projects/core/src/lib/services/validation/validation.service.ts similarity index 99% rename from projects/core/src/lib/services/validation.service.ts rename to projects/core/src/lib/services/validation/validation.service.ts index ceff06c1..80d8f80c 100644 --- a/projects/core/src/lib/services/validation.service.ts +++ b/projects/core/src/lib/services/validation/validation.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { AbstractControl, FormGroup, ValidationErrors, ValidatorFn } from "@angular/forms"; -import { PasswordValidationErrors } from "@auth/models/password-errors.model"; +import { PasswordValidationErrors } from "projects/social_platform/src/app/domain/auth/password-errors.model"; import * as dayjs from "dayjs"; import * as cpf from "dayjs/plugin/customParseFormat"; import * as relativeTime from "dayjs/plugin/relativeTime"; diff --git a/projects/social_platform/src/app/core/services/websocket.service.spec.ts b/projects/core/src/lib/services/websockets/websocket.service.spec.ts similarity index 85% rename from projects/social_platform/src/app/core/services/websocket.service.spec.ts rename to projects/core/src/lib/services/websockets/websocket.service.spec.ts index 934582bc..a4b9355f 100644 --- a/projects/social_platform/src/app/core/services/websocket.service.spec.ts +++ b/projects/core/src/lib/services/websockets/websocket.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { WebsocketService } from "./websocket.service"; +import { WebsocketService } from "../websocket.service"; describe("WebsocketService", () => { let service: WebsocketService; diff --git a/projects/social_platform/src/app/core/services/websocket.service.ts b/projects/core/src/lib/services/websockets/websocket.service.ts similarity index 100% rename from projects/social_platform/src/app/core/services/websocket.service.ts rename to projects/core/src/lib/services/websockets/websocket.service.ts diff --git a/projects/skills/src/app/app.component.ts b/projects/skills/src/app/app.component.ts index 3c70b677..1945bd37 100644 --- a/projects/skills/src/app/app.component.ts +++ b/projects/skills/src/app/app.component.ts @@ -7,7 +7,7 @@ import { IconComponent, SidebarComponent } from "@uilib"; import { SidebarProfileComponent } from "./shared/sidebar-profile/sidebar-profile.component"; import { ProfileService } from "./profile/services/profile.service"; import type { UserData } from "../models/profile.model"; -import { AuthService } from "@auth/services"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * Корневой компонент приложения, который служит основным контейнером макета diff --git a/projects/skills/src/app/profile/services/profile.service.ts b/projects/skills/src/app/profile/services/profile.service.ts index 8d8fefe9..8c9176b1 100644 --- a/projects/skills/src/app/profile/services/profile.service.ts +++ b/projects/skills/src/app/profile/services/profile.service.ts @@ -1,8 +1,9 @@ /** @format */ import { inject, Injectable } from "@angular/core"; -import { SkillsApiService, SubscriptionData } from "@corelib"; import { Profile, UserData } from "../../../models/profile.model"; +import { SkillsApiService } from "projects/core/src/lib/services/api/skillsApi.service"; +import { SubscriptionData } from "@corelib"; /** * Служба профилей diff --git a/projects/social_platform/src/app/office/services/advert.service.spec.ts b/projects/social_platform/src/app/api/advert/advert.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/services/advert.service.spec.ts rename to projects/social_platform/src/app/api/advert/advert.service.spec.ts index 6f848541..d2813f52 100644 --- a/projects/social_platform/src/app/office/services/advert.service.spec.ts +++ b/projects/social_platform/src/app/api/advert/advert.service.spec.ts @@ -2,8 +2,8 @@ import { TestBed } from "@angular/core/testing"; -import { AdvertService } from "./advert.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { AdvertService } from "./advert.service"; describe("ArticleService", () => { let service: AdvertService; diff --git a/projects/social_platform/src/app/office/services/advert.service.ts b/projects/social_platform/src/app/api/advert/advert.service.ts similarity index 96% rename from projects/social_platform/src/app/office/services/advert.service.ts rename to projects/social_platform/src/app/api/advert/advert.service.ts index 75e7fdfe..ebe9d3d5 100644 --- a/projects/social_platform/src/app/office/services/advert.service.ts +++ b/projects/social_platform/src/app/api/advert/advert.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { map, Observable } from "rxjs"; -import { New } from "@models/article.model"; +import { New } from "projects/social_platform/src/app/domain/news/article.model"; import { ApiService } from "projects/core"; import { plainToInstance } from "class-transformer"; diff --git a/projects/social_platform/src/app/auth/services/auth.service.spec.ts b/projects/social_platform/src/app/api/auth/auth.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/auth/services/auth.service.spec.ts rename to projects/social_platform/src/app/api/auth/auth.service.spec.ts diff --git a/projects/social_platform/src/app/auth/services/auth.service.ts b/projects/social_platform/src/app/api/auth/auth.service.ts similarity index 98% rename from projects/social_platform/src/app/auth/services/auth.service.ts rename to projects/social_platform/src/app/api/auth/auth.service.ts index 97056c75..3655d910 100644 --- a/projects/social_platform/src/app/auth/services/auth.service.ts +++ b/projects/social_platform/src/app/api/auth/auth.service.ts @@ -9,8 +9,8 @@ import { LoginResponse, RegisterRequest, RegisterResponse, -} from "../models/http.model"; -import { User, UserRole } from "../models/user.model"; +} from "../../domain/auth/http.model"; +import { User, UserRole } from "../../domain/auth/user.model"; /** * Сервис аутентификации и управления пользователями diff --git a/projects/social_platform/src/app/auth/services/index.ts b/projects/social_platform/src/app/api/auth/index.ts similarity index 100% rename from projects/social_platform/src/app/auth/services/index.ts rename to projects/social_platform/src/app/api/auth/index.ts diff --git a/projects/social_platform/src/app/auth/services/profile.service.spec.ts b/projects/social_platform/src/app/api/auth/profile.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/auth/services/profile.service.spec.ts rename to projects/social_platform/src/app/api/auth/profile.service.spec.ts diff --git a/projects/social_platform/src/app/auth/services/profile.service.ts b/projects/social_platform/src/app/api/auth/profile.service.ts similarity index 95% rename from projects/social_platform/src/app/auth/services/profile.service.ts rename to projects/social_platform/src/app/api/auth/profile.service.ts index 984a0e90..ed9471b6 100644 --- a/projects/social_platform/src/app/auth/services/profile.service.ts +++ b/projects/social_platform/src/app/api/auth/profile.service.ts @@ -2,10 +2,10 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; -import { Achievement } from "../models/user.model"; +import { Achievement } from "../../domain/auth/user.model"; import { map, Observable } from "rxjs"; import { plainToInstance } from "class-transformer"; -import { Approve } from "@office/models/skill"; +import { Approve } from "../../domain/skills/skill"; /** * Сервис управления профилем пользователя diff --git a/projects/social_platform/src/app/office/chat/services/chat-direct.service.spec.ts b/projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service.spec.ts similarity index 84% rename from projects/social_platform/src/app/office/chat/services/chat-direct.service.spec.ts rename to projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service.spec.ts index b7349437..2a25d458 100644 --- a/projects/social_platform/src/app/office/chat/services/chat-direct.service.spec.ts +++ b/projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ChatDirectService } from "./chat-direct.service"; +import { ChatDirectService } from "../ui/pages/chat/services/chat-direct.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; describe("ChatDirectService", () => { diff --git a/projects/social_platform/src/app/office/chat/services/chat-direct.service.ts b/projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service.ts similarity index 90% rename from projects/social_platform/src/app/office/chat/services/chat-direct.service.ts rename to projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service.ts index caa7f180..9ba7b980 100644 --- a/projects/social_platform/src/app/office/chat/services/chat-direct.service.ts +++ b/projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service.ts @@ -3,10 +3,10 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { Observable } from "rxjs"; -import { ChatItem, ChatListItem } from "@office/chat/models/chat-item.model"; import { HttpParams } from "@angular/common/http"; -import { ApiPagination } from "@models/api-pagination.model"; -import { ChatMessage } from "@models/chat-message.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; +import { ChatItem, ChatListItem } from "../../../domain/chat/chat-item.model"; /** * Сервис для работы с прямыми чатами (личными сообщениями) diff --git a/projects/social_platform/src/app/office/chat/services/chat-project.service.spec.ts b/projects/social_platform/src/app/api/chat/chat-projects/chat-project.service.spec.ts similarity index 84% rename from projects/social_platform/src/app/office/chat/services/chat-project.service.spec.ts rename to projects/social_platform/src/app/api/chat/chat-projects/chat-project.service.spec.ts index 73de1886..dd724c29 100644 --- a/projects/social_platform/src/app/office/chat/services/chat-project.service.spec.ts +++ b/projects/social_platform/src/app/api/chat/chat-projects/chat-project.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ChatProjectService } from "./chat-project.service"; +import { ChatProjectService } from "../ui/pages/chat/services/chat-project.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; describe("ChatProjectService", () => { diff --git a/projects/social_platform/src/app/office/chat/services/chat-project.service.ts b/projects/social_platform/src/app/api/chat/chat-projects/chat-project.service.ts similarity index 93% rename from projects/social_platform/src/app/office/chat/services/chat-project.service.ts rename to projects/social_platform/src/app/api/chat/chat-projects/chat-project.service.ts index 3dce31d6..9546ee99 100644 --- a/projects/social_platform/src/app/office/chat/services/chat-project.service.ts +++ b/projects/social_platform/src/app/api/chat/chat-projects/chat-project.service.ts @@ -3,7 +3,7 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { Observable } from "rxjs"; -import { ChatListItem } from "@office/chat/models/chat-item.model"; +import { ChatListItem } from "../../../domain/chat/chat-item.model"; /** * Сервис для работы с чатами проектов (групповыми чатами) diff --git a/projects/social_platform/src/app/office/services/chat.service.spec.ts b/projects/social_platform/src/app/api/chat/chat.service.spec.ts similarity index 90% rename from projects/social_platform/src/app/office/services/chat.service.spec.ts rename to projects/social_platform/src/app/api/chat/chat.service.spec.ts index 53af8d19..8d74e76c 100644 --- a/projects/social_platform/src/app/office/services/chat.service.spec.ts +++ b/projects/social_platform/src/app/api/chat/chat.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ChatService } from "./chat.service"; +import { ChatService } from "../chat.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; describe("ChatService", () => { diff --git a/projects/social_platform/src/app/office/services/chat.service.ts b/projects/social_platform/src/app/api/chat/chat.service.ts similarity index 96% rename from projects/social_platform/src/app/office/services/chat.service.ts rename to projects/social_platform/src/app/api/chat/chat.service.ts index dee4ed65..b195efa2 100644 --- a/projects/social_platform/src/app/office/services/chat.service.ts +++ b/projects/social_platform/src/app/api/chat/chat.service.ts @@ -2,9 +2,12 @@ import { HttpParams } from "@angular/common/http"; import { Injectable } from "@angular/core"; -import { WebsocketService } from "@core/services/websocket.service"; -import { ApiPagination } from "@models/api-pagination.model"; -import { ChatFile, ChatMessage } from "@models/chat-message.model"; +import { WebsocketService } from "projects/core/src/lib/services/websockets/websocket.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { + ChatFile, + ChatMessage, +} from "projects/social_platform/src/app/domain/chat/chat-message.model"; import { ChatEventType, DeleteChatMessageDto, @@ -18,7 +21,7 @@ import { SendChatMessageDto, TypingInChatDto, TypingInChatEventDto, -} from "@models/chat.model"; +} from "projects/social_platform/src/app/domain/chat/chat.model"; import { plainToInstance } from "class-transformer"; import { ApiService, TokenService } from "projects/core"; import { BehaviorSubject, map, Observable } from "rxjs"; diff --git a/projects/social_platform/src/app/office/feed/services/feed.service.ts b/projects/social_platform/src/app/api/feed/feed.service.ts similarity index 95% rename from projects/social_platform/src/app/office/feed/services/feed.service.ts rename to projects/social_platform/src/app/api/feed/feed.service.ts index 740d0cc1..5a193940 100644 --- a/projects/social_platform/src/app/office/feed/services/feed.service.ts +++ b/projects/social_platform/src/app/api/feed/feed.service.ts @@ -3,9 +3,9 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { Observable } from "rxjs"; -import { FeedItem, FeedItemType } from "@office/feed/models/feed-item.model"; -import { ApiPagination } from "@models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; +import { FeedItem, FeedItemType } from "../../domain/feed/feed-item.model"; /** * СЕРВИС ДЛЯ РАБОТЫ С ЛЕНТОЙ НОВОСТЕЙ diff --git a/projects/social_platform/src/app/office/services/industry.service.spec.ts b/projects/social_platform/src/app/api/industry/industry.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/services/industry.service.spec.ts rename to projects/social_platform/src/app/api/industry/industry.service.spec.ts diff --git a/projects/social_platform/src/app/office/services/industry.service.ts b/projects/social_platform/src/app/api/industry/industry.service.ts similarity index 97% rename from projects/social_platform/src/app/office/services/industry.service.ts rename to projects/social_platform/src/app/api/industry/industry.service.ts index 6fb9b8f1..e4f489dd 100644 --- a/projects/social_platform/src/app/office/services/industry.service.ts +++ b/projects/social_platform/src/app/api/industry/industry.service.ts @@ -3,7 +3,7 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { BehaviorSubject, catchError, map, Observable, tap, throwError } from "rxjs"; -import { Industry } from "@models/industry.model"; +import { Industry } from "projects/social_platform/src/app/domain/industry/industry.model"; import { plainToInstance } from "class-transformer"; /** diff --git a/projects/social_platform/src/app/office/services/invite.service.spec.ts b/projects/social_platform/src/app/api/invite/invite.service.spec.ts similarity index 90% rename from projects/social_platform/src/app/office/services/invite.service.spec.ts rename to projects/social_platform/src/app/api/invite/invite.service.spec.ts index b4e18f32..866f32d3 100644 --- a/projects/social_platform/src/app/office/services/invite.service.spec.ts +++ b/projects/social_platform/src/app/api/invite/invite.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { InviteService } from "./invite.service"; +import { InviteService } from "../office/services/invite.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { of } from "rxjs"; import { AuthService } from "@auth/services"; diff --git a/projects/social_platform/src/app/office/services/invite.service.ts b/projects/social_platform/src/app/api/invite/invite.service.ts similarity index 97% rename from projects/social_platform/src/app/office/services/invite.service.ts rename to projects/social_platform/src/app/api/invite/invite.service.ts index 78718678..f948d74b 100644 --- a/projects/social_platform/src/app/office/services/invite.service.ts +++ b/projects/social_platform/src/app/api/invite/invite.service.ts @@ -4,9 +4,9 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { concatMap, map, Observable, take } from "rxjs"; import { plainToInstance } from "class-transformer"; -import { Invite } from "@models/invite.model"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; import { HttpParams } from "@angular/common/http"; -import { AuthService } from "@auth/services"; +import { AuthService } from "../auth"; /** * Сервис для управления приглашениями в проекты diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/dto/comment.model.dto.ts b/projects/social_platform/src/app/api/kanban/dto/comment.model.dto.ts similarity index 63% rename from projects/social_platform/src/app/office/projects/detail/kanban/models/dto/comment.model.dto.ts rename to projects/social_platform/src/app/api/kanban/dto/comment.model.dto.ts index 6432e704..7ea79202 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/models/dto/comment.model.dto.ts +++ b/projects/social_platform/src/app/api/kanban/dto/comment.model.dto.ts @@ -1,6 +1,6 @@ /** @format */ -import { User } from "@auth/models/user.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; export interface CommentDto { id: number; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/dto/performer.model.dto.ts b/projects/social_platform/src/app/api/kanban/dto/performer.model.dto.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/models/dto/performer.model.dto.ts rename to projects/social_platform/src/app/api/kanban/dto/performer.model.dto.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/dto/tag.model.dto.ts b/projects/social_platform/src/app/api/kanban/dto/tag.model.dto.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/models/dto/tag.model.dto.ts rename to projects/social_platform/src/app/api/kanban/dto/tag.model.dto.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-detail-info.service.ts b/projects/social_platform/src/app/api/kanban/kanban-board-detail-info.service.ts similarity index 94% rename from projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-detail-info.service.ts rename to projects/social_platform/src/app/api/kanban/kanban-board-detail-info.service.ts index bc03c9ec..02d002d5 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-detail-info.service.ts +++ b/projects/social_platform/src/app/api/kanban/kanban-board-detail-info.service.ts @@ -1,12 +1,12 @@ /** @format */ import { computed, inject, Injectable, signal } from "@angular/core"; -import { TaskDetail } from "../models/task.model"; -import { User } from "@auth/models/user.model"; -import { AuthService } from "@auth/services"; +import { TaskDetail } from "../../domain/kanban/task.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { filter, Observable, of, Subject } from "rxjs"; -import { ProjectDataService } from "../../services/project-data.service"; +import { ProjectDataService } from "../project/project-data.service"; import { ActivatedRoute, Router } from "@angular/router"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; @Injectable({ providedIn: "root", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-info.service.ts b/projects/social_platform/src/app/api/kanban/kanban-board-info.service.ts similarity index 96% rename from projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-info.service.ts rename to projects/social_platform/src/app/api/kanban/kanban-board-info.service.ts index 3400fa79..9c5eeeaf 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board-info.service.ts +++ b/projects/social_platform/src/app/api/kanban/kanban-board-info.service.ts @@ -1,7 +1,7 @@ /** @format */ import { computed, Injectable, signal } from "@angular/core"; -import { Board } from "../models/board.model"; +import { Board } from "../../domain/kanban/board.model"; @Injectable({ providedIn: "root" }) export class KanbanBoardInfoService { diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board.service.ts b/projects/social_platform/src/app/api/kanban/kanban-board.service.ts similarity index 91% rename from projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board.service.ts rename to projects/social_platform/src/app/api/kanban/kanban-board.service.ts index b78fcf39..bd2e51f7 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/services/kanban-board.service.ts +++ b/projects/social_platform/src/app/api/kanban/kanban-board.service.ts @@ -2,7 +2,7 @@ import { inject, Injectable } from "@angular/core"; import { ApiService } from "@corelib"; -import { TaskDetail } from "../models/task.model"; +import { TaskDetail } from "../../domain/kanban/task.model"; import { Observable } from "rxjs"; @Injectable({ diff --git a/projects/social_platform/src/app/office/services/member.service.spec.ts b/projects/social_platform/src/app/api/member/member.service.spec.ts similarity index 91% rename from projects/social_platform/src/app/office/services/member.service.spec.ts rename to projects/social_platform/src/app/api/member/member.service.spec.ts index adcb0505..acc58fea 100644 --- a/projects/social_platform/src/app/office/services/member.service.spec.ts +++ b/projects/social_platform/src/app/api/member/member.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { MemberService } from "./member.service"; +import { MemberService } from "../member.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; describe("MemberService", () => { diff --git a/projects/social_platform/src/app/office/services/member.service.ts b/projects/social_platform/src/app/api/member/member.service.ts similarity index 94% rename from projects/social_platform/src/app/office/services/member.service.ts rename to projects/social_platform/src/app/api/member/member.service.ts index 47467f72..b6577d0d 100644 --- a/projects/social_platform/src/app/office/services/member.service.ts +++ b/projects/social_platform/src/app/api/member/member.service.ts @@ -4,8 +4,8 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { Observable } from "rxjs"; import { HttpParams } from "@angular/common/http"; -import { ApiPagination } from "@models/api-pagination.model"; -import { User } from "@auth/models/user.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; /** * Сервис для работы с участниками платформы diff --git a/projects/social_platform/src/app/office/onboarding/services/onboarding.service.spec.ts b/projects/social_platform/src/app/api/onboarding/onboarding.service.spec.ts similarity index 92% rename from projects/social_platform/src/app/office/onboarding/services/onboarding.service.spec.ts rename to projects/social_platform/src/app/api/onboarding/onboarding.service.spec.ts index 85fb23bb..1fcc0c9b 100644 --- a/projects/social_platform/src/app/office/onboarding/services/onboarding.service.spec.ts +++ b/projects/social_platform/src/app/api/onboarding/onboarding.service.spec.ts @@ -2,9 +2,9 @@ import { TestBed } from "@angular/core/testing"; -import { OnboardingService } from "./onboarding.service"; -import { AuthService } from "@auth/services"; import { of } from "rxjs"; +import { OnboardingService } from "./onboarding.service"; +import { AuthService } from "../auth"; describe("OnboardingService", () => { let service: OnboardingService; diff --git a/projects/social_platform/src/app/office/onboarding/services/onboarding.service.ts b/projects/social_platform/src/app/api/onboarding/onboarding.service.ts similarity index 96% rename from projects/social_platform/src/app/office/onboarding/services/onboarding.service.ts rename to projects/social_platform/src/app/api/onboarding/onboarding.service.ts index d2d67436..7e1d94ba 100644 --- a/projects/social_platform/src/app/office/onboarding/services/onboarding.service.ts +++ b/projects/social_platform/src/app/api/onboarding/onboarding.service.ts @@ -1,9 +1,9 @@ /** @format */ import { Injectable } from "@angular/core"; -import { User } from "@auth/models/user.model"; -import { AuthService } from "@auth/services"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { BehaviorSubject, take } from "rxjs"; +import { AuthService } from "../auth"; /** * СЕРВИС УПРАВЛЕНИЯ СОСТОЯНИЕМ ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/profile/detail/services/profile-date.service.ts b/projects/social_platform/src/app/api/profile/profile-date.service.ts similarity index 89% rename from projects/social_platform/src/app/office/profile/detail/services/profile-date.service.ts rename to projects/social_platform/src/app/api/profile/profile-date.service.ts index 9c53ceec..739ed93e 100644 --- a/projects/social_platform/src/app/office/profile/detail/services/profile-date.service.ts +++ b/projects/social_platform/src/app/api/profile/profile-date.service.ts @@ -1,9 +1,9 @@ /** @format */ import { Injectable } from "@angular/core"; -import { User } from "@auth/models/user.model"; -import { Project } from "@office/models/project.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { BehaviorSubject, filter, map } from "rxjs"; +import { Project } from "../../domain/project/project.model"; @Injectable({ providedIn: "root", diff --git a/projects/social_platform/src/app/office/profile/detail/services/profile-news.service.spec.ts b/projects/social_platform/src/app/api/profile/profile-news.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/profile/detail/services/profile-news.service.spec.ts rename to projects/social_platform/src/app/api/profile/profile-news.service.spec.ts diff --git a/projects/social_platform/src/app/office/profile/detail/services/profile-news.service.ts b/projects/social_platform/src/app/api/profile/profile-news.service.ts similarity index 96% rename from projects/social_platform/src/app/office/profile/detail/services/profile-news.service.ts rename to projects/social_platform/src/app/api/profile/profile-news.service.ts index e411da09..23b59f17 100644 --- a/projects/social_platform/src/app/office/profile/detail/services/profile-news.service.ts +++ b/projects/social_platform/src/app/api/profile/profile-news.service.ts @@ -3,11 +3,11 @@ import { inject, Injectable } from "@angular/core"; import { forkJoin, map, Observable, tap } from "rxjs"; import { ApiService } from "projects/core"; -import { ProfileNews } from "../models/profile-news.model"; +import { ProfileNews } from "../../domain/profile/profile-news.model"; import { HttpParams } from "@angular/common/http"; import { plainToInstance } from "class-transformer"; -import { StorageService } from "@services/storage.service"; -import { ApiPagination } from "@models/api-pagination.model"; +import { StorageService } from "projects/social_platform/src/app/api/storage/storage.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; /** * Сервис для работы с новостями профиля пользователя diff --git a/projects/social_platform/src/app/office/program/services/program-data.service.ts b/projects/social_platform/src/app/api/program/program-data.service.ts similarity index 91% rename from projects/social_platform/src/app/office/program/services/program-data.service.ts rename to projects/social_platform/src/app/api/program/program-data.service.ts index 16fb879c..eae50f6f 100644 --- a/projects/social_platform/src/app/office/program/services/program-data.service.ts +++ b/projects/social_platform/src/app/api/program/program-data.service.ts @@ -1,7 +1,7 @@ /** @format */ import { computed, Injectable, signal } from "@angular/core"; -import { Program } from "../models/program.model"; +import { Program } from "../../domain/program/program.model"; @Injectable({ providedIn: "root", diff --git a/projects/social_platform/src/app/office/program/services/program-news.service.spec.ts b/projects/social_platform/src/app/api/program/program-news.service.spec.ts similarity index 83% rename from projects/social_platform/src/app/office/program/services/program-news.service.spec.ts rename to projects/social_platform/src/app/api/program/program-news.service.spec.ts index b1b76beb..eafa8015 100644 --- a/projects/social_platform/src/app/office/program/services/program-news.service.spec.ts +++ b/projects/social_platform/src/app/api/program/program-news.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ProgramNewsService } from "./program-news.service"; +import { ProgramNewsService } from "../ui/pages/program/services/program-news.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; describe("ProgramNewsService", () => { diff --git a/projects/social_platform/src/app/office/program/services/program-news.service.ts b/projects/social_platform/src/app/api/program/program-news.service.ts similarity index 94% rename from projects/social_platform/src/app/office/program/services/program-news.service.ts rename to projects/social_platform/src/app/api/program/program-news.service.ts index 9f7c51ec..c684df07 100644 --- a/projects/social_platform/src/app/office/program/services/program-news.service.ts +++ b/projects/social_platform/src/app/api/program/program-news.service.ts @@ -3,10 +3,10 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { forkJoin, map, Observable } from "rxjs"; -import { ApiPagination } from "@models/api-pagination.model"; -import { FeedNews } from "@office/projects/models/project-news.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; import { plainToInstance } from "class-transformer"; +import { FeedNews } from "../../domain/project/project-news.model"; /** * Сервис для работы с новостями программ diff --git a/projects/social_platform/src/app/office/program/services/program.service.spec.ts b/projects/social_platform/src/app/api/program/program.service.spec.ts similarity index 87% rename from projects/social_platform/src/app/office/program/services/program.service.spec.ts rename to projects/social_platform/src/app/api/program/program.service.spec.ts index 922a404c..6568e652 100644 --- a/projects/social_platform/src/app/office/program/services/program.service.spec.ts +++ b/projects/social_platform/src/app/api/program/program.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ProgramService } from "./program.service"; +import { ProgramService } from "../ui/pages/program/services/program.service"; import { RouterTestingModule } from "@angular/router/testing"; import { HttpClientTestingModule } from "@angular/common/http/testing"; diff --git a/projects/social_platform/src/app/office/program/services/program.service.ts b/projects/social_platform/src/app/api/program/program.service.ts similarity index 90% rename from projects/social_platform/src/app/office/program/services/program.service.ts rename to projects/social_platform/src/app/api/program/program.service.ts index f5e79ed1..aa21458f 100644 --- a/projects/social_platform/src/app/office/program/services/program.service.ts +++ b/projects/social_platform/src/app/api/program/program.service.ts @@ -4,12 +4,12 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { map, Observable } from "rxjs"; import { HttpParams } from "@angular/common/http"; -import { ProgramCreate } from "@office/program/models/program-create.model"; -import { Program, ProgramDataSchema } from "@office/program/models/program.model"; -import { Project } from "@models/project.model"; -import { ApiPagination } from "@models/api-pagination.model"; -import { User } from "@auth/models/user.model"; -import { PartnerProgramFields } from "@office/models/partner-program-fields.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { PartnerProgramFields } from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { Program, ProgramDataSchema } from "../../domain/program/program.model"; +import { ProgramCreate } from "../../domain/program/program-create.model"; +import { Project } from "../../domain/project/project.model"; /** * Сервис для работы с программами diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-achievements.service.ts b/projects/social_platform/src/app/api/project/project-achievements.service.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/services/project-achievements.service.ts rename to projects/social_platform/src/app/api/project/project-achievements.service.ts diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-additional.service.ts b/projects/social_platform/src/app/api/project/project-additional.service.ts similarity index 97% rename from projects/social_platform/src/app/office/projects/edit/services/project-additional.service.ts rename to projects/social_platform/src/app/api/project/project-additional.service.ts index 5a83bfb5..d7792047 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-additional.service.ts +++ b/projects/social_platform/src/app/api/project/project-additional.service.ts @@ -6,10 +6,10 @@ import { PartnerProgramFields, PartnerProgramFieldsValues, projectNewAdditionalProgramVields, -} from "@office/models/partner-program-fields.model"; -import { ProgramService } from "@office/program/services/program.service"; -import { ProjectService } from "@services/project.service"; +} from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { Observable } from "rxjs"; +import { ProgramService } from "../program/program.service"; /** * Сервис для управления дополнительными полями проекта в партнерской программе. diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-contacts.service.ts b/projects/social_platform/src/app/api/project/project-contacts.service.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/services/project-contacts.service.ts rename to projects/social_platform/src/app/api/project/project-contacts.service.ts diff --git a/projects/social_platform/src/app/office/projects/detail/services/project-data.service.ts b/projects/social_platform/src/app/api/project/project-data.service.ts similarity index 89% rename from projects/social_platform/src/app/office/projects/detail/services/project-data.service.ts rename to projects/social_platform/src/app/api/project/project-data.service.ts index af8eeeb8..54dc022b 100644 --- a/projects/social_platform/src/app/office/projects/detail/services/project-data.service.ts +++ b/projects/social_platform/src/app/api/project/project-data.service.ts @@ -1,7 +1,7 @@ /** @format */ import { computed, Injectable, signal } from "@angular/core"; -import { Project } from "@office/models/project.model"; +import { Project } from "../../domain/project/project.model"; @Injectable({ providedIn: "root", diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts b/projects/social_platform/src/app/api/project/project-form.service.ts similarity index 97% rename from projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts rename to projects/social_platform/src/app/api/project/project-form.service.ts index 5fa82bf3..c7160d86 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts +++ b/projects/social_platform/src/app/api/project/project-form.service.ts @@ -10,11 +10,11 @@ import { ValidatorFn, } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { PartnerProgramFields } from "@office/models/partner-program-fields.model"; -import { Project } from "@office/models/project.model"; -import { ProjectService } from "@office/services/project.service"; +import { PartnerProgramFields } from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { stripNullish } from "@utils/helpers/stripNull"; import { concatMap, filter } from "rxjs"; +import { Project } from "../../domain/project/project.model"; /** * Сервис для управления основной формой проекта и формой дополнительных полей партнерской программы. * Обеспечивает создание, инициализацию, валидацию, автосохранение, сброс и получение данных форм. diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-goals.service.ts b/projects/social_platform/src/app/api/project/project-goals.service.ts similarity index 98% rename from projects/social_platform/src/app/office/projects/edit/services/project-goals.service.ts rename to projects/social_platform/src/app/api/project/project-goals.service.ts index 14512b54..fd3c42c0 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-goals.service.ts +++ b/projects/social_platform/src/app/api/project/project-goals.service.ts @@ -3,9 +3,9 @@ import { inject, Injectable, signal } from "@angular/core"; import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; import { ProjectFormService } from "./project-form.service"; -import { Goal, GoalDto } from "@office/models/goals.model"; import { catchError, forkJoin, map, of, tap } from "rxjs"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { Goal, GoalDto } from "../../domain/project/goals.model"; /** * Сервис для управления целями проекта diff --git a/projects/social_platform/src/app/office/projects/detail/services/project-news.service.ts b/projects/social_platform/src/app/api/project/project-news.service.ts similarity index 96% rename from projects/social_platform/src/app/office/projects/detail/services/project-news.service.ts rename to projects/social_platform/src/app/api/project/project-news.service.ts index 03319cf9..d11b5601 100644 --- a/projects/social_platform/src/app/office/projects/detail/services/project-news.service.ts +++ b/projects/social_platform/src/app/api/project/project-news.service.ts @@ -2,12 +2,12 @@ import { inject, Injectable } from "@angular/core"; import { ApiService } from "projects/core"; -import { FeedNews } from "@office/projects/models/project-news.model"; import { forkJoin, map, Observable, tap } from "rxjs"; import { plainToInstance } from "class-transformer"; import { HttpParams } from "@angular/common/http"; -import { StorageService } from "@services/storage.service"; -import { ApiPagination } from "@models/api-pagination.model"; +import { StorageService } from "projects/social_platform/src/app/api/storage/storage.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { FeedNews } from "../../domain/project/project-news.model"; /** * СЕРВИС ДЛЯ РАБОТЫ С НОВОСТЯМИ ПРОЕКТА diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-partner.service.ts b/projects/social_platform/src/app/api/project/project-partner.service.ts similarity index 98% rename from projects/social_platform/src/app/office/projects/edit/services/project-partner.service.ts rename to projects/social_platform/src/app/api/project/project-partner.service.ts index 93cfea2e..6df113a2 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-partner.service.ts +++ b/projects/social_platform/src/app/api/project/project-partner.service.ts @@ -2,9 +2,9 @@ import { inject, Injectable, signal } from "@angular/core"; import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; -import { Partner, PartnerDto } from "@office/models/partner.model"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { catchError, forkJoin, map, Observable, of, tap } from "rxjs"; +import { Partner, PartnerDto } from "../../domain/project/partner.model"; @Injectable({ providedIn: "root", diff --git a/projects/social_platform/src/app/office/program/services/project-rating.service.spec.ts b/projects/social_platform/src/app/api/project/project-rating.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/services/project-rating.service.spec.ts rename to projects/social_platform/src/app/api/project/project-rating.service.spec.ts diff --git a/projects/social_platform/src/app/office/program/services/project-rating.service.ts b/projects/social_platform/src/app/api/project/project-rating.service.ts similarity index 92% rename from projects/social_platform/src/app/office/program/services/project-rating.service.ts rename to projects/social_platform/src/app/api/project/project-rating.service.ts index e30cb490..67461c54 100644 --- a/projects/social_platform/src/app/office/program/services/project-rating.service.ts +++ b/projects/social_platform/src/app/api/project/project-rating.service.ts @@ -4,10 +4,10 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { Observable } from "rxjs"; import { HttpParams } from "@angular/common/http"; -import { ApiPagination } from "@models/api-pagination.model"; -import { ProjectRate } from "../models/project-rate"; -import { ProjectRatingCriterion } from "../models/project-rating-criterion"; -import { ProjectRatingCriterionOutput } from "../models/project-rating-criterion-output"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { ProjectRate } from "../../domain/project/project-rate"; +import { ProjectRatingCriterionOutput } from "../../domain/project/project-rating-criterion-output"; +import { ProjectRatingCriterion } from "../../domain/project/project-rating-criterion"; /** * Сервис для оценки проектов в рамках программы diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts b/projects/social_platform/src/app/api/project/project-resources.service.ts similarity index 98% rename from projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts rename to projects/social_platform/src/app/api/project/project-resources.service.ts index 319e6671..51043678 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-resources.service.ts +++ b/projects/social_platform/src/app/api/project/project-resources.service.ts @@ -2,9 +2,9 @@ import { inject, Injectable, signal } from "@angular/core"; import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; -import { Resource, ResourceDto } from "@office/models/resource.model"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { catchError, forkJoin, map, of, tap } from "rxjs"; +import { Resource, ResourceDto } from "../../domain/project/resource.model"; @Injectable({ providedIn: "root", diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-step.service.ts b/projects/social_platform/src/app/api/project/project-step.service.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/services/project-step.service.ts rename to projects/social_platform/src/app/api/project/project-step.service.ts diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-team.service.ts b/projects/social_platform/src/app/api/project/project-team.service.ts similarity index 96% rename from projects/social_platform/src/app/office/projects/edit/services/project-team.service.ts rename to projects/social_platform/src/app/api/project/project-team.service.ts index be1597dd..5f534426 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-team.service.ts +++ b/projects/social_platform/src/app/api/project/project-team.service.ts @@ -3,9 +3,9 @@ import { computed, inject, Injectable, signal } from "@angular/core"; import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { ValidationService } from "@corelib"; -import { Collaborator } from "@office/models/collaborator.model"; -import { Invite } from "@office/models/invite.model"; -import { InviteService } from "@services/invite.service"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; /** * Сервис для управления приглашениями участников команды проекта. diff --git a/projects/social_platform/src/app/office/projects/edit/services/project-vacancy.service.ts b/projects/social_platform/src/app/api/project/project-vacancy.service.ts similarity index 98% rename from projects/social_platform/src/app/office/projects/edit/services/project-vacancy.service.ts rename to projects/social_platform/src/app/api/project/project-vacancy.service.ts index 26782b1e..3530217b 100644 --- a/projects/social_platform/src/app/office/projects/edit/services/project-vacancy.service.ts +++ b/projects/social_platform/src/app/api/project/project-vacancy.service.ts @@ -4,15 +4,15 @@ import { inject, Injectable, signal } from "@angular/core"; import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; import { ValidationService } from "@corelib"; -import { Skill } from "@office/models/skill"; -import { Vacancy } from "@office/models/vacancy.model"; -import { VacancyService } from "@office/services/vacancy.service"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; import { stripNullish } from "@utils/helpers/stripNull"; import { rolesMembersList } from "projects/core/src/consts/lists/roles-members-list.const"; import { ProjectFormService } from "./project-form.service"; import { workExperienceList } from "projects/core/src/consts/lists/work-experience-list.const"; import { workFormatList } from "projects/core/src/consts/lists/work-format-list.const"; import { workScheludeList } from "projects/core/src/consts/lists/work-schelude-list.const"; +import { Skill } from "../../domain/skills/skill"; +import { VacancyService } from "../vacancy/vacancy.service"; /** * Сервис для управления вакансиями проекта. diff --git a/projects/social_platform/src/app/office/services/project.service.spec.ts b/projects/social_platform/src/app/api/project/project.service.spec.ts similarity index 93% rename from projects/social_platform/src/app/office/services/project.service.spec.ts rename to projects/social_platform/src/app/api/project/project.service.spec.ts index f14d9fd1..73c5ad29 100644 --- a/projects/social_platform/src/app/office/services/project.service.spec.ts +++ b/projects/social_platform/src/app/api/project/project.service.spec.ts @@ -2,10 +2,10 @@ import { TestBed } from "@angular/core/testing"; -import { ProjectService } from "./project.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { of } from "rxjs"; -import { AuthService } from "@auth/services"; +import { AuthService } from "../auth"; +import { ProjectService } from "./project.service"; describe("ProjectService", () => { let service: ProjectService; diff --git a/projects/social_platform/src/app/office/services/project.service.ts b/projects/social_platform/src/app/api/project/project.service.ts similarity index 95% rename from projects/social_platform/src/app/office/services/project.service.ts rename to projects/social_platform/src/app/api/project/project.service.ts index 27b867ba..86063664 100644 --- a/projects/social_platform/src/app/office/services/project.service.ts +++ b/projects/social_platform/src/app/api/project/project.service.ts @@ -2,17 +2,17 @@ import { Injectable } from "@angular/core"; import { BehaviorSubject, map, Observable, tap } from "rxjs"; -import { Project, ProjectCount, ProjectStep } from "@models/project.model"; import { ApiService } from "projects/core"; import { plainToInstance } from "class-transformer"; import { HttpParams } from "@angular/common/http"; -import { ApiPagination } from "@models/api-pagination.model"; -import { Collaborator } from "@office/models/collaborator.model"; -import { ProjectAssign } from "@office/projects/models/project-assign.model"; -import { projectNewAdditionalProgramVields } from "@office/models/partner-program-fields.model"; -import { Goal, GoalDto } from "@office/models/goals.model"; -import { Partner, PartnerDto } from "@office/models/partner.model"; -import { Resource, ResourceDto } from "@office/models/resource.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; +import { projectNewAdditionalProgramVields } from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { Project, ProjectCount, ProjectStep } from "../../domain/project/project.model"; +import { Partner, PartnerDto } from "../../domain/project/partner.model"; +import { Resource, ResourceDto } from "../../domain/project/resource.model"; +import { Goal, GoalDto } from "../../domain/project/goals.model"; +import { ProjectAssign } from "../../domain/project/project-assign.model"; /** * Сервис для управления проектами diff --git a/projects/social_platform/src/app/office/projects/services/projects.service.ts b/projects/social_platform/src/app/api/project/projects.service.ts similarity index 89% rename from projects/social_platform/src/app/office/projects/services/projects.service.ts rename to projects/social_platform/src/app/api/project/projects.service.ts index 037766d7..136f4067 100644 --- a/projects/social_platform/src/app/office/projects/services/projects.service.ts +++ b/projects/social_platform/src/app/api/project/projects.service.ts @@ -2,7 +2,7 @@ import { inject, Injectable } from "@angular/core"; import { Router } from "@angular/router"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; @Injectable({ providedIn: "root", diff --git a/projects/social_platform/src/app/office/services/skills.service.ts b/projects/social_platform/src/app/api/skills/skills.service.ts similarity index 91% rename from projects/social_platform/src/app/office/services/skills.service.ts rename to projects/social_platform/src/app/api/skills/skills.service.ts index 528320d7..76a73961 100644 --- a/projects/social_platform/src/app/office/services/skills.service.ts +++ b/projects/social_platform/src/app/api/skills/skills.service.ts @@ -1,12 +1,12 @@ /** @format */ import { Injectable } from "@angular/core"; -import { SkillsGroup } from "../models/skills-group"; import { Observable } from "rxjs"; import { ApiService } from "@corelib"; -import { Skill } from "../models/skill"; -import { ApiPagination } from "@office/models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; +import { SkillsGroup } from "../../domain/skills/skills-group"; +import { Skill } from "../../domain/skills/skill"; /** * Сервис для работы с навыками пользователей diff --git a/projects/social_platform/src/app/office/services/specializations.service.ts b/projects/social_platform/src/app/api/specializations/specializations.service.ts similarity index 90% rename from projects/social_platform/src/app/office/services/specializations.service.ts rename to projects/social_platform/src/app/api/specializations/specializations.service.ts index 5d4a3ac2..6d027f3e 100644 --- a/projects/social_platform/src/app/office/services/specializations.service.ts +++ b/projects/social_platform/src/app/api/specializations/specializations.service.ts @@ -1,12 +1,12 @@ /** @format */ import { Injectable } from "@angular/core"; -import { SpecializationsGroup } from "../models/specializations-group"; import { Observable } from "rxjs"; import { ApiService } from "@corelib"; -import { Specialization } from "../models/specialization"; -import { ApiPagination } from "@office/models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; +import { SpecializationsGroup } from "../../domain/specializations/specializations-group"; +import { Specialization } from "../../domain/specializations/specialization"; /** * Сервис для работы со специализациями пользователей diff --git a/projects/social_platform/src/app/office/services/storage.service.ts b/projects/social_platform/src/app/api/storage/storage.service.ts similarity index 100% rename from projects/social_platform/src/app/office/services/storage.service.ts rename to projects/social_platform/src/app/api/storage/storage.service.ts diff --git a/projects/social_platform/src/app/office/services/subscription.service.spec.ts b/projects/social_platform/src/app/api/subsriptions/subscription.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/services/subscription.service.spec.ts rename to projects/social_platform/src/app/api/subsriptions/subscription.service.spec.ts diff --git a/projects/social_platform/src/app/office/services/subscription.service.ts b/projects/social_platform/src/app/api/subsriptions/subscription.service.ts similarity index 93% rename from projects/social_platform/src/app/office/services/subscription.service.ts rename to projects/social_platform/src/app/api/subsriptions/subscription.service.ts index 16785f7c..9734b213 100644 --- a/projects/social_platform/src/app/office/services/subscription.service.ts +++ b/projects/social_platform/src/app/api/subsriptions/subscription.service.ts @@ -3,10 +3,10 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { Observable } from "rxjs"; -import { ProjectSubscriber } from "@office/models/project-subscriber.model"; -import { ApiPagination } from "@office/models/api-pagination.model"; -import { Project } from "@office/models/project.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; +import { ProjectSubscriber } from "../../domain/project/project-subscriber.model"; +import { Project } from "../../domain/project/project.model"; /** * Сервис для управления подписками на проекты diff --git a/projects/social_platform/src/app/office/services/vacancy.service.spec.ts b/projects/social_platform/src/app/api/vacancy/vacancy.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/services/vacancy.service.spec.ts rename to projects/social_platform/src/app/api/vacancy/vacancy.service.spec.ts diff --git a/projects/social_platform/src/app/office/services/vacancy.service.ts b/projects/social_platform/src/app/api/vacancy/vacancy.service.ts similarity index 97% rename from projects/social_platform/src/app/office/services/vacancy.service.ts rename to projects/social_platform/src/app/api/vacancy/vacancy.service.ts index fa2fcde5..808f381a 100644 --- a/projects/social_platform/src/app/office/services/vacancy.service.ts +++ b/projects/social_platform/src/app/api/vacancy/vacancy.service.ts @@ -3,9 +3,9 @@ import { Injectable } from "@angular/core"; import { ApiService } from "projects/core"; import { map, Observable } from "rxjs"; -import { Vacancy } from "@models/vacancy.model"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; import { plainToInstance } from "class-transformer"; -import { VacancyResponse } from "@models/vacancy-response.model"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; import { HttpParams } from "@angular/common/http"; /** diff --git a/projects/social_platform/src/app/app.component.spec.ts b/projects/social_platform/src/app/app.component.spec.ts index 51502f6f..f4575070 100644 --- a/projects/social_platform/src/app/app.component.spec.ts +++ b/projects/social_platform/src/app/app.component.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from "@angular/core/testing"; import { RouterTestingModule } from "@angular/router/testing"; import { AppComponent } from "./app.component"; -import { AuthService } from "@auth/services"; +import { AuthService } from "./api/auth"; describe("AppComponent", () => { beforeEach(async () => { diff --git a/projects/social_platform/src/app/app.component.ts b/projects/social_platform/src/app/app.component.ts index 861f9e76..b78cc0fe 100644 --- a/projects/social_platform/src/app/app.component.ts +++ b/projects/social_platform/src/app/app.component.ts @@ -2,7 +2,6 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ResolveEnd, ResolveStart, Router, RouterOutlet } from "@angular/router"; -import { AuthService } from "@auth/services"; import { debounceTime, filter, @@ -18,7 +17,8 @@ import { import { MatProgressBarModule } from "@angular/material/progress-bar"; import { AsyncPipe, NgIf } from "@angular/common"; import { TokenService } from "@corelib"; -import { LoadingService } from "@office/services/loading.service"; +import { LoadingService } from "@ui/services/loading/loading.service"; +import { AuthService } from "./api/auth"; /** * Корневой компонент приложения diff --git a/projects/social_platform/src/app/app.config.ts b/projects/social_platform/src/app/app.config.ts index 9679cff7..03decebe 100644 --- a/projects/social_platform/src/app/app.config.ts +++ b/projects/social_platform/src/app/app.config.ts @@ -6,7 +6,7 @@ import { provideAnimations } from "@angular/platform-browser/animations"; import { NgxMaskModule } from "ngx-mask"; import { ReactiveFormsModule } from "@angular/forms"; import { BrowserModule } from "@angular/platform-browser"; -import { GlobalErrorHandlerService } from "@error/services/global-error-handler.service"; +import { GlobalErrorHandlerService } from "projects/core/src/lib/services/error/global-error-handler.service"; import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from "@angular/common/http"; import { provideRouter, withRouterConfig } from "@angular/router"; import { APP_ROUTES } from "./app.routes"; diff --git a/projects/social_platform/src/app/app.routes.ts b/projects/social_platform/src/app/app.routes.ts index fc1b1aa3..683d23e1 100644 --- a/projects/social_platform/src/app/app.routes.ts +++ b/projects/social_platform/src/app/app.routes.ts @@ -2,7 +2,7 @@ import { Routes } from "@angular/router"; import { AppComponent } from "./app.component"; -import { AuthRequiredGuard } from "@auth/guards/auth-required.guard"; +import { AuthRequiredGuard } from "projects/core/src/lib/guards/auth/auth-required.guard"; /** * Основные маршруты приложения @@ -21,15 +21,15 @@ export const APP_ROUTES: Routes = [ }, { path: "auth", - loadChildren: () => import("./auth/auth.routes").then(c => c.AUTH_ROUTES), + loadChildren: () => import("./ui/routes/auth/auth.routes").then(c => c.AUTH_ROUTES), }, { path: "error", - loadChildren: () => import("./error/error.routes").then(c => c.ERROR_ROUTES), + loadChildren: () => import("./ui/routes/error/error.routes").then(c => c.ERROR_ROUTES), }, { path: "office", - loadChildren: () => import("./office/office.routes").then(c => c.OFFICE_ROUTES), + loadChildren: () => import("./ui/routes/office/office.routes").then(c => c.OFFICE_ROUTES), canActivate: [AuthRequiredGuard], }, { diff --git a/projects/social_platform/src/app/core/README.md b/projects/social_platform/src/app/core/README.md deleted file mode 100644 index 70a80480..00000000 --- a/projects/social_platform/src/app/core/README.md +++ /dev/null @@ -1,59 +0,0 @@ - - -# Core Модуль - -Основные сервисы и утилиты, используемые во всем приложении. - -## Сервисы - -### 📁 FileService - -Сервис для работы с файлами - -- Загрузка файлов на сервер -- Скачивание файлов -- Валидация типов и размеров -- Генерация превью - -### 🔌 WebSocketService - -Сервис для работы с WebSocket соединениями - -- Подключение к серверу -- Отправка и получение сообщений -- Автоматическое переподключение -- Обработка ошибок соединения - -## Пайпы - -### 👤 UserRolePipe - -Преобразование роли пользователя в читаемый вид - -### 🔗 UserLinksPipe - -Форматирование ссылок пользователя - -### 📊 FormattedFileSizePipe - -Форматирование размера файла в читаемый вид - -- Автоматический выбор единиц (B, KB, MB, GB) -- Округление до нужного количества знаков - -## Модели - -### 🌐 HttpModel - -Базовые модели для HTTP запросов и ответов - -- Стандартизированные форматы -- Обработка ошибок -- Типизация ответов сервера - -## Принципы - -1. **Переиспользование**: Все сервисы могут использоваться в любом модуле -2. **Типизация**: Строгая типизация всех данных -3. **Обработка ошибок**: Централизованная обработка ошибок -4. **Производительность**: Оптимизированные алгоритмы для работы с данными diff --git a/projects/social_platform/src/app/auth/models/http.model.ts b/projects/social_platform/src/app/domain/auth/http.model.ts similarity index 100% rename from projects/social_platform/src/app/auth/models/http.model.ts rename to projects/social_platform/src/app/domain/auth/http.model.ts diff --git a/projects/social_platform/src/app/auth/models/password-errors.model.ts b/projects/social_platform/src/app/domain/auth/password-errors.model.ts similarity index 100% rename from projects/social_platform/src/app/auth/models/password-errors.model.ts rename to projects/social_platform/src/app/domain/auth/password-errors.model.ts diff --git a/projects/social_platform/src/app/auth/models/tokens.model.ts b/projects/social_platform/src/app/domain/auth/tokens.model.ts similarity index 100% rename from projects/social_platform/src/app/auth/models/tokens.model.ts rename to projects/social_platform/src/app/domain/auth/tokens.model.ts diff --git a/projects/social_platform/src/app/auth/models/user.model.ts b/projects/social_platform/src/app/domain/auth/user.model.ts similarity index 95% rename from projects/social_platform/src/app/auth/models/user.model.ts rename to projects/social_platform/src/app/domain/auth/user.model.ts index 402ca5de..f708b3e6 100644 --- a/projects/social_platform/src/app/auth/models/user.model.ts +++ b/projects/social_platform/src/app/domain/auth/user.model.ts @@ -1,9 +1,9 @@ /** @format */ -import { Project } from "@models/project.model"; -import { FileModel } from "@office/models/file.model"; -import { Skill } from "@office/models/skill"; -import { Program } from "@office/program/models/program.model"; +import { FileModel } from "../file/file.model"; +import { Program } from "../program/program.model"; +import { Project } from "../project/project.model"; +import { Skill } from "../skills/skill"; /** * Модели данных пользователя и связанных сущностей diff --git a/projects/social_platform/src/app/office/chat/models/chat-item.model.ts b/projects/social_platform/src/app/domain/chat/chat-item.model.ts similarity index 91% rename from projects/social_platform/src/app/office/chat/models/chat-item.model.ts rename to projects/social_platform/src/app/domain/chat/chat-item.model.ts index e794fde1..6a52d34a 100644 --- a/projects/social_platform/src/app/office/chat/models/chat-item.model.ts +++ b/projects/social_platform/src/app/domain/chat/chat-item.model.ts @@ -1,7 +1,7 @@ /** @format */ -import { User } from "@auth/models/user.model"; -import { ChatMessage } from "@models/chat-message.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; /** * Модели данных для элементов чата diff --git a/projects/social_platform/src/app/office/models/chat-message.model.ts b/projects/social_platform/src/app/domain/chat/chat-message.model.ts similarity index 97% rename from projects/social_platform/src/app/office/models/chat-message.model.ts rename to projects/social_platform/src/app/domain/chat/chat-message.model.ts index 5d54fdcc..1cbbe87d 100644 --- a/projects/social_platform/src/app/office/models/chat-message.model.ts +++ b/projects/social_platform/src/app/domain/chat/chat-message.model.ts @@ -1,6 +1,6 @@ /** @format */ -import { User } from "@auth/models/user.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import * as dayjs from "dayjs"; /** diff --git a/projects/social_platform/src/app/office/models/chat.model.ts b/projects/social_platform/src/app/domain/chat/chat.model.ts similarity index 97% rename from projects/social_platform/src/app/office/models/chat.model.ts rename to projects/social_platform/src/app/domain/chat/chat.model.ts index 454d815c..55eaa7d0 100644 --- a/projects/social_platform/src/app/office/models/chat.model.ts +++ b/projects/social_platform/src/app/domain/chat/chat.model.ts @@ -1,5 +1,5 @@ /** @format */ -import type { ChatMessage } from "@models/chat-message.model"; +import type { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; /** * Класс для уведомления об изменении статуса пользователя diff --git a/projects/social_platform/src/app/office/feed/models/feed-item.model.ts b/projects/social_platform/src/app/domain/feed/feed-item.model.ts similarity index 93% rename from projects/social_platform/src/app/office/feed/models/feed-item.model.ts rename to projects/social_platform/src/app/domain/feed/feed-item.model.ts index 14dd6cbe..698fce74 100644 --- a/projects/social_platform/src/app/office/feed/models/feed-item.model.ts +++ b/projects/social_platform/src/app/domain/feed/feed-item.model.ts @@ -1,8 +1,8 @@ /** @format */ -import { FeedNews } from "@office/projects/models/project-news.model"; -import { Vacancy } from "@models/vacancy.model"; -import { Program } from "@office/program/models/program.model"; +import { Program } from "../program/program.model"; +import { FeedNews } from "../project/project-news.model"; +import { Vacancy } from "../vacancy/vacancy.model"; /** * МОДЕЛИ ДАННЫХ ДЛЯ ЭЛЕМЕНТОВ ЛЕНТЫ diff --git a/projects/social_platform/src/app/office/models/file.model.ts b/projects/social_platform/src/app/domain/file/file.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/file.model.ts rename to projects/social_platform/src/app/domain/file/file.model.ts diff --git a/projects/social_platform/src/app/office/models/industry.model.ts b/projects/social_platform/src/app/domain/industry/industry.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/industry.model.ts rename to projects/social_platform/src/app/domain/industry/industry.model.ts diff --git a/projects/social_platform/src/app/office/models/invite.model.ts b/projects/social_platform/src/app/domain/invite/invite.model.ts similarity index 84% rename from projects/social_platform/src/app/office/models/invite.model.ts rename to projects/social_platform/src/app/domain/invite/invite.model.ts index aaba627e..58000729 100644 --- a/projects/social_platform/src/app/office/models/invite.model.ts +++ b/projects/social_platform/src/app/domain/invite/invite.model.ts @@ -1,7 +1,7 @@ /** @format */ -import { User } from "@auth/models/user.model"; -import { Project } from "./project.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { Project } from "../project/project.model"; /** * Модель приглашения в проект diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/board.model.ts b/projects/social_platform/src/app/domain/kanban/board.model.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/models/board.model.ts rename to projects/social_platform/src/app/domain/kanban/board.model.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/column.model.ts b/projects/social_platform/src/app/domain/kanban/column.model.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/models/column.model.ts rename to projects/social_platform/src/app/domain/kanban/column.model.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/comments.model.ts b/projects/social_platform/src/app/domain/kanban/comments.model.ts similarity index 68% rename from projects/social_platform/src/app/office/projects/detail/kanban/models/comments.model.ts rename to projects/social_platform/src/app/domain/kanban/comments.model.ts index 65421ae6..1c8bba4e 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/models/comments.model.ts +++ b/projects/social_platform/src/app/domain/kanban/comments.model.ts @@ -1,8 +1,8 @@ /** @format */ -import { FileModel } from "@office/models/file.model"; +import { FileModel } from "projects/social_platform/src/app/domain/file/file.model"; import { TaskDetail } from "./task.model"; -import { User } from "@auth/models/user.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; export interface Comment { id: number; diff --git a/projects/social_platform/src/app/office/models/tag.model.ts b/projects/social_platform/src/app/domain/kanban/tag.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/tag.model.ts rename to projects/social_platform/src/app/domain/kanban/tag.model.ts diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/models/task.model.ts b/projects/social_platform/src/app/domain/kanban/task.model.ts similarity index 77% rename from projects/social_platform/src/app/office/projects/detail/kanban/models/task.model.ts rename to projects/social_platform/src/app/domain/kanban/task.model.ts index 20598c5b..0a8f8bd4 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/models/task.model.ts +++ b/projects/social_platform/src/app/domain/kanban/task.model.ts @@ -1,11 +1,11 @@ /** @format */ -import { User } from "@auth/models/user.model"; -import { FileModel } from "@office/models/file.model"; -import { Goal } from "@office/models/goals.model"; -import { Skill } from "@office/models/skill"; -import { Tag } from "@office/models/tag.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { FileModel } from "projects/social_platform/src/app/domain/file/file.model"; import { Column } from "./column.model"; +import { Goal } from "../project/goals.model"; +import { Tag } from "./tag.model"; +import { Skill } from "../skills/skill"; export interface TaskResult { description: string; diff --git a/projects/social_platform/src/app/office/models/article.model.ts b/projects/social_platform/src/app/domain/news/article.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/article.model.ts rename to projects/social_platform/src/app/domain/news/article.model.ts diff --git a/projects/social_platform/src/app/office/models/api-pagination.model.ts b/projects/social_platform/src/app/domain/other/api-pagination.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/api-pagination.model.ts rename to projects/social_platform/src/app/domain/other/api-pagination.model.ts diff --git a/projects/social_platform/src/app/office/models/filter-fields.model.ts b/projects/social_platform/src/app/domain/other/filter-fields.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/filter-fields.model.ts rename to projects/social_platform/src/app/domain/other/filter-fields.model.ts diff --git a/projects/social_platform/src/app/office/models/notification.model.ts b/projects/social_platform/src/app/domain/other/notification.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/notification.model.ts rename to projects/social_platform/src/app/domain/other/notification.model.ts diff --git a/projects/social_platform/src/app/office/profile/detail/models/profile-news.model.ts b/projects/social_platform/src/app/domain/profile/profile-news.model.ts similarity index 96% rename from projects/social_platform/src/app/office/profile/detail/models/profile-news.model.ts rename to projects/social_platform/src/app/domain/profile/profile-news.model.ts index 3c78c107..123dc079 100644 --- a/projects/social_platform/src/app/office/profile/detail/models/profile-news.model.ts +++ b/projects/social_platform/src/app/domain/profile/profile-news.model.ts @@ -1,7 +1,7 @@ /** @format */ import * as dayjs from "dayjs"; -import { FileModel } from "@models/file.model"; +import { FileModel } from "projects/social_platform/src/app/domain/file/file.model"; /** * Модель данных для новости профиля пользователя diff --git a/projects/social_platform/src/app/office/models/partner-program-fields.model.ts b/projects/social_platform/src/app/domain/program/partner-program-fields.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/partner-program-fields.model.ts rename to projects/social_platform/src/app/domain/program/partner-program-fields.model.ts diff --git a/projects/social_platform/src/app/office/program/models/program-create.model.ts b/projects/social_platform/src/app/domain/program/program-create.model.ts similarity index 100% rename from projects/social_platform/src/app/office/program/models/program-create.model.ts rename to projects/social_platform/src/app/domain/program/program-create.model.ts diff --git a/projects/social_platform/src/app/office/program/models/program.model.ts b/projects/social_platform/src/app/domain/program/program.model.ts similarity index 100% rename from projects/social_platform/src/app/office/program/models/program.model.ts rename to projects/social_platform/src/app/domain/program/program.model.ts diff --git a/projects/social_platform/src/app/office/program/models/programs-result.model.ts b/projects/social_platform/src/app/domain/program/programs-result.model.ts similarity index 100% rename from projects/social_platform/src/app/office/program/models/programs-result.model.ts rename to projects/social_platform/src/app/domain/program/programs-result.model.ts diff --git a/projects/social_platform/src/app/office/models/collaborator.model.ts b/projects/social_platform/src/app/domain/project/collaborator.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/collaborator.model.ts rename to projects/social_platform/src/app/domain/project/collaborator.model.ts diff --git a/projects/social_platform/src/app/office/models/goals.model.ts b/projects/social_platform/src/app/domain/project/goals.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/goals.model.ts rename to projects/social_platform/src/app/domain/project/goals.model.ts diff --git a/projects/social_platform/src/app/office/models/partner.model.ts b/projects/social_platform/src/app/domain/project/partner.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/partner.model.ts rename to projects/social_platform/src/app/domain/project/partner.model.ts diff --git a/projects/social_platform/src/app/office/projects/models/project-assign.model.ts b/projects/social_platform/src/app/domain/project/project-assign.model.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/models/project-assign.model.ts rename to projects/social_platform/src/app/domain/project/project-assign.model.ts diff --git a/projects/social_platform/src/app/office/projects/models/project-news.model.ts b/projects/social_platform/src/app/domain/project/project-news.model.ts similarity index 96% rename from projects/social_platform/src/app/office/projects/models/project-news.model.ts rename to projects/social_platform/src/app/domain/project/project-news.model.ts index 12a069c5..15518052 100644 --- a/projects/social_platform/src/app/office/projects/models/project-news.model.ts +++ b/projects/social_platform/src/app/domain/project/project-news.model.ts @@ -1,7 +1,7 @@ /** @format */ import * as dayjs from "dayjs"; -import { FileModel } from "@models/file.model"; +import { FileModel } from "projects/social_platform/src/app/domain/file/file.model"; /** * Модель для новостей проекта (FeedNews) diff --git a/projects/social_platform/src/app/office/program/models/project-rate.ts b/projects/social_platform/src/app/domain/project/project-rate.ts similarity index 100% rename from projects/social_platform/src/app/office/program/models/project-rate.ts rename to projects/social_platform/src/app/domain/project/project-rate.ts diff --git a/projects/social_platform/src/app/office/program/models/project-rating-criterion-output.ts b/projects/social_platform/src/app/domain/project/project-rating-criterion-output.ts similarity index 100% rename from projects/social_platform/src/app/office/program/models/project-rating-criterion-output.ts rename to projects/social_platform/src/app/domain/project/project-rating-criterion-output.ts diff --git a/projects/social_platform/src/app/office/program/models/project-rating-criterion-type.ts b/projects/social_platform/src/app/domain/project/project-rating-criterion-type.ts similarity index 100% rename from projects/social_platform/src/app/office/program/models/project-rating-criterion-type.ts rename to projects/social_platform/src/app/domain/project/project-rating-criterion-type.ts diff --git a/projects/social_platform/src/app/office/program/models/project-rating-criterion.ts b/projects/social_platform/src/app/domain/project/project-rating-criterion.ts similarity index 100% rename from projects/social_platform/src/app/office/program/models/project-rating-criterion.ts rename to projects/social_platform/src/app/domain/project/project-rating-criterion.ts diff --git a/projects/social_platform/src/app/office/models/project-subscriber.model.ts b/projects/social_platform/src/app/domain/project/project-subscriber.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/project-subscriber.model.ts rename to projects/social_platform/src/app/domain/project/project-subscriber.model.ts diff --git a/projects/social_platform/src/app/office/models/project.model.ts b/projects/social_platform/src/app/domain/project/project.model.ts similarity index 94% rename from projects/social_platform/src/app/office/models/project.model.ts rename to projects/social_platform/src/app/domain/project/project.model.ts index 2d800125..d9cf358a 100644 --- a/projects/social_platform/src/app/office/models/project.model.ts +++ b/projects/social_platform/src/app/domain/project/project.model.ts @@ -1,11 +1,14 @@ /** @format */ +import { + PartnerProgramFields, + PartnerProgramFieldsValues, +} from "../program/partner-program-fields.model"; +import { Vacancy } from "../vacancy/vacancy.model"; import { Collaborator } from "./collaborator.model"; import { Goal } from "./goals.model"; -import { PartnerProgramFields, PartnerProgramFieldsValues } from "./partner-program-fields.model"; import { Partner } from "./partner.model"; import { Resource } from "./resource.model"; -import { Vacancy } from "./vacancy.model"; /** * Основная модель проекта и связанные классы diff --git a/projects/social_platform/src/app/office/models/resource.model.ts b/projects/social_platform/src/app/domain/project/resource.model.ts similarity index 100% rename from projects/social_platform/src/app/office/models/resource.model.ts rename to projects/social_platform/src/app/domain/project/resource.model.ts diff --git a/projects/social_platform/src/app/office/models/skill.ts b/projects/social_platform/src/app/domain/skills/skill.ts similarity index 100% rename from projects/social_platform/src/app/office/models/skill.ts rename to projects/social_platform/src/app/domain/skills/skill.ts diff --git a/projects/social_platform/src/app/office/models/skills-group.ts b/projects/social_platform/src/app/domain/skills/skills-group.ts similarity index 100% rename from projects/social_platform/src/app/office/models/skills-group.ts rename to projects/social_platform/src/app/domain/skills/skills-group.ts diff --git a/projects/social_platform/src/app/office/models/specialization.ts b/projects/social_platform/src/app/domain/specializations/specialization.ts similarity index 100% rename from projects/social_platform/src/app/office/models/specialization.ts rename to projects/social_platform/src/app/domain/specializations/specialization.ts diff --git a/projects/social_platform/src/app/office/models/specializations-group.ts b/projects/social_platform/src/app/domain/specializations/specializations-group.ts similarity index 89% rename from projects/social_platform/src/app/office/models/specializations-group.ts rename to projects/social_platform/src/app/domain/specializations/specializations-group.ts index 55149beb..4c928e22 100644 --- a/projects/social_platform/src/app/office/models/specializations-group.ts +++ b/projects/social_platform/src/app/domain/specializations/specializations-group.ts @@ -1,6 +1,6 @@ /** @format */ -import type { Specialization } from "./specialization"; +import { Specialization } from "./specialization"; /** * Модель группы специализаций diff --git a/projects/social_platform/src/app/office/models/vacancy-response.model.ts b/projects/social_platform/src/app/domain/vacancy/vacancy-response.model.ts similarity index 83% rename from projects/social_platform/src/app/office/models/vacancy-response.model.ts rename to projects/social_platform/src/app/domain/vacancy/vacancy-response.model.ts index 4350a0d4..813e6557 100644 --- a/projects/social_platform/src/app/office/models/vacancy-response.model.ts +++ b/projects/social_platform/src/app/domain/vacancy/vacancy-response.model.ts @@ -1,7 +1,7 @@ /** @format */ -import { User } from "@auth/models/user.model"; -import { FileModel } from "./file.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { FileModel } from "../file/file.model"; /** * Модель отклика на вакансию diff --git a/projects/social_platform/src/app/office/models/vacancy.model.ts b/projects/social_platform/src/app/domain/vacancy/vacancy.model.ts similarity index 90% rename from projects/social_platform/src/app/office/models/vacancy.model.ts rename to projects/social_platform/src/app/domain/vacancy/vacancy.model.ts index bf4d49a9..f11b63d8 100644 --- a/projects/social_platform/src/app/office/models/vacancy.model.ts +++ b/projects/social_platform/src/app/domain/vacancy/vacancy.model.ts @@ -1,7 +1,7 @@ /** @format */ -import { Project } from "@models/project.model"; -import { Skill } from "./skill"; +import { Project } from "../project/project.model"; +import { Skill } from "../skills/skill"; /** * Модель вакансии в проекте diff --git a/projects/social_platform/src/app/office/features/approve-skill/approve-skill.component.html b/projects/social_platform/src/app/ui/components/approve-skill/approve-skill.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/approve-skill/approve-skill.component.html rename to projects/social_platform/src/app/ui/components/approve-skill/approve-skill.component.html diff --git a/projects/social_platform/src/app/office/features/approve-skill/approve-skill.component.scss b/projects/social_platform/src/app/ui/components/approve-skill/approve-skill.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/approve-skill/approve-skill.component.scss rename to projects/social_platform/src/app/ui/components/approve-skill/approve-skill.component.scss diff --git a/projects/social_platform/src/app/office/features/approve-skill/approve-skill.component.ts b/projects/social_platform/src/app/ui/components/approve-skill/approve-skill.component.ts similarity index 89% rename from projects/social_platform/src/app/office/features/approve-skill/approve-skill.component.ts rename to projects/social_platform/src/app/ui/components/approve-skill/approve-skill.component.ts index 3a1db27d..17e29b91 100644 --- a/projects/social_platform/src/app/office/features/approve-skill/approve-skill.component.ts +++ b/projects/social_platform/src/app/ui/components/approve-skill/approve-skill.component.ts @@ -3,18 +3,17 @@ import { CommonModule } from "@angular/common"; import { ChangeDetectorRef, Component, inject, Input, OnDestroy, OnInit } from "@angular/core"; import { PluralizePipe } from "@corelib"; -import { Skill } from "@office/models/skill"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { ButtonComponent } from "@ui/components"; import { map, of, Subscription, switchMap } from "rxjs"; -import { AuthService } from "@auth/services"; import { ActivatedRoute } from "@angular/router"; -import { ProfileService } from "projects/skills/src/app/profile/services/profile.service"; -import { ProfileService as profileApproveSkillService } from "@auth/services/profile.service"; -import { SnackbarService } from "@ui/services/snackbar.service"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; import { HttpErrorResponse } from "@angular/common/http"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { ApproveSkillPeopleComponent } from "@office/shared/approve-skill-people/approve-skill-people.component"; +import { ApproveSkillPeopleComponent } from "@ui/shared/approve-skill-people/approve-skill-people.component"; +import { AuthService } from "../../../api/auth"; +import { ProfileService as ProfileApproveSkillService } from "../../../api/auth/profile.service"; +import { Skill } from "../../../domain/skills/skill"; /** * @params skill - информация о навыке (обязательно) @@ -40,7 +39,7 @@ import { ApproveSkillPeopleComponent } from "@office/shared/approve-skill-people export class ApproveSkillComponent implements OnInit, OnDestroy { private readonly authService = inject(AuthService); private readonly route = inject(ActivatedRoute); - private readonly profileApproveSkillService = inject(profileApproveSkillService); + private readonly profileApproveSkillService = inject(ProfileApproveSkillService); private readonly snackbarService = inject(SnackbarService); private readonly cdRef = inject(ChangeDetectorRef); diff --git a/projects/social_platform/src/app/ui/components/avatar-control/avatar-control.component.ts b/projects/social_platform/src/app/ui/components/avatar-control/avatar-control.component.ts index f48c594b..ff532571 100644 --- a/projects/social_platform/src/app/ui/components/avatar-control/avatar-control.component.ts +++ b/projects/social_platform/src/app/ui/components/avatar-control/avatar-control.component.ts @@ -3,7 +3,7 @@ import { Component, forwardRef, Input, OnInit } from "@angular/core"; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms"; import { nanoid } from "nanoid"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; import { catchError, concatMap, map, of } from "rxjs"; import { IconComponent, ButtonComponent } from "@ui/components"; import { LoaderComponent } from "../loader/loader.component"; diff --git a/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.spec.ts b/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.spec.ts index 789521d3..072882e5 100644 --- a/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.spec.ts +++ b/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { ChatMessageComponent } from "./chat-message.component"; -import { ChatMessage } from "@models/chat-message.model"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; import { AuthService } from "@auth/services"; import { of } from "rxjs"; import { RouterTestingModule } from "@angular/router/testing"; diff --git a/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.ts b/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.ts index 9aac541a..e7cf9508 100644 --- a/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.ts +++ b/projects/social_platform/src/app/ui/components/chat-message/chat-message.component.ts @@ -11,17 +11,17 @@ import { Output, ViewChild, } from "@angular/core"; -import { ChatMessage } from "@models/chat-message.model"; -import { SnackbarService } from "@ui/services/snackbar.service"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; import { DomPortal } from "@angular/cdk/portal"; import { Overlay, OverlayRef } from "@angular/cdk/overlay"; -import { AuthService } from "@auth/services"; import { DayjsPipe } from "projects/core"; import { IconComponent } from "@ui/components"; import { FileItemComponent } from "../file-item/file-item.component"; import { AsyncPipe } from "@angular/common"; import { AvatarComponent } from "../avatar/avatar.component"; import { ClickOutsideModule } from "ng-click-outside"; +import { AuthService } from "../../../api/auth"; /** * Компонент сообщения в чате с контекстным меню и файловыми вложениями. diff --git a/projects/social_platform/src/app/office/features/chat-window/chat-window.component.html b/projects/social_platform/src/app/ui/components/chat-window/chat-window.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/chat-window/chat-window.component.html rename to projects/social_platform/src/app/ui/components/chat-window/chat-window.component.html diff --git a/projects/social_platform/src/app/office/features/chat-window/chat-window.component.scss b/projects/social_platform/src/app/ui/components/chat-window/chat-window.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/chat-window/chat-window.component.scss rename to projects/social_platform/src/app/ui/components/chat-window/chat-window.component.scss diff --git a/projects/social_platform/src/app/office/features/chat-window/chat-window.component.spec.ts b/projects/social_platform/src/app/ui/components/chat-window/chat-window.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/chat-window/chat-window.component.spec.ts rename to projects/social_platform/src/app/ui/components/chat-window/chat-window.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/chat-window/chat-window.component.ts b/projects/social_platform/src/app/ui/components/chat-window/chat-window.component.ts similarity index 97% rename from projects/social_platform/src/app/office/features/chat-window/chat-window.component.ts rename to projects/social_platform/src/app/ui/components/chat-window/chat-window.component.ts index bef4f4a2..3f1acb23 100644 --- a/projects/social_platform/src/app/office/features/chat-window/chat-window.component.ts +++ b/projects/social_platform/src/app/ui/components/chat-window/chat-window.component.ts @@ -16,15 +16,15 @@ import { CdkVirtualForOf, CdkVirtualScrollViewport, } from "@angular/cdk/scrolling"; -import { ChatMessage } from "@models/chat-message.model"; -import { MessageInputComponent } from "@office/features/message-input/message-input.component"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; +import { MessageInputComponent } from "@ui/components/message-input/message-input.component"; import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; import { filter, fromEvent, noop, skip, Subscription, tap, throttleTime } from "rxjs"; import { ModalService } from "@ui/models/modal.service"; -import { AuthService } from "@auth/services"; -import { User } from "@auth/models/user.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { PluralizePipe } from "projects/core"; import { ChatMessageComponent } from "@ui/components/chat-message/chat-message.component"; +import { AuthService } from "../../../api/auth"; /** * Компонент окна чата diff --git a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.html b/projects/social_platform/src/app/ui/components/context-menu/context-menu.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/context-menu/context-menu.component.html rename to projects/social_platform/src/app/ui/components/context-menu/context-menu.component.html diff --git a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss b/projects/social_platform/src/app/ui/components/context-menu/context-menu.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/context-menu/context-menu.component.scss rename to projects/social_platform/src/app/ui/components/context-menu/context-menu.component.scss diff --git a/projects/social_platform/src/app/office/features/context-menu/context-menu.component.ts b/projects/social_platform/src/app/ui/components/context-menu/context-menu.component.ts similarity index 100% rename from projects/social_platform/src/app/office/features/context-menu/context-menu.component.ts rename to projects/social_platform/src/app/ui/components/context-menu/context-menu.component.ts diff --git a/projects/social_platform/src/app/office/features/detail/detail.component.html b/projects/social_platform/src/app/ui/components/detail/detail.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/detail/detail.component.html rename to projects/social_platform/src/app/ui/components/detail/detail.component.html diff --git a/projects/social_platform/src/app/office/features/detail/detail.component.scss b/projects/social_platform/src/app/ui/components/detail/detail.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/detail/detail.component.scss rename to projects/social_platform/src/app/ui/components/detail/detail.component.scss diff --git a/projects/social_platform/src/app/office/features/detail/detail.component.ts b/projects/social_platform/src/app/ui/components/detail/detail.component.ts similarity index 93% rename from projects/social_platform/src/app/office/features/detail/detail.component.ts rename to projects/social_platform/src/app/ui/components/detail/detail.component.ts index 51ccbfda..9b81f614 100644 --- a/projects/social_platform/src/app/office/features/detail/detail.component.ts +++ b/projects/social_platform/src/app/ui/components/detail/detail.component.ts @@ -14,27 +14,27 @@ import { ButtonComponent, InputComponent } from "@ui/components"; import { BackComponent, IconComponent } from "@uilib"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { ActivatedRoute, Router, RouterModule } from "@angular/router"; -import { AuthService } from "@auth/services"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { TooltipComponent } from "@ui/components/tooltip/tooltip.component"; import { concatMap, filter, map, of, Subscription, tap } from "rxjs"; -import { User } from "@auth/models/user.model"; -import { Collaborator } from "@office/models/collaborator.model"; -import { ProjectService } from "@office/services/project.service"; -import { Project } from "@office/models/project.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { HttpErrorResponse } from "@angular/common/http"; -import { ProjectAssign } from "@office/projects/models/project-assign.model"; -import { ProjectAdditionalService } from "@office/projects/edit/services/project-additional.service"; -import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; -import { ProgramDataService } from "@office/program/services/program-data.service"; -import { ChatService } from "@office/services/chat.service"; +import { ChatService } from "projects/social_platform/src/app/api/chat/chat.service"; import { calculateProfileProgress } from "@utils/calculateProgress"; -import { ProfileDataService } from "@office/profile/detail/services/profile-date.service"; +import { ProfileDataService } from "projects/social_platform/src/app/api/profile/profile-date.service"; import { ProfileService } from "projects/skills/src/app/profile/services/profile.service"; -import { SnackbarService } from "@ui/services/snackbar.service"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; import { ApproveSkillComponent } from "../approve-skill/approve-skill.component"; -import { ProjectsService } from "@office/projects/services/projects.service"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { AuthService } from "../../../api/auth"; +import { ProgramDataService } from "../../../api/program/program-data.service"; +import { ProjectDataService } from "../../../api/project/project-data.service"; +import { ProjectAdditionalService } from "../../../api/project/project-additional.service"; +import { ProjectsService } from "../../../api/project/projects.service"; +import { Project } from "../../../domain/project/project.model"; +import { ProjectAssign } from "../../../domain/project/project-assign.model"; @Component({ selector: "app-detail", diff --git a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts index 1e06646e..8c55562f 100644 --- a/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts +++ b/projects/social_platform/src/app/ui/components/dropdown/dropdown.component.ts @@ -8,8 +8,8 @@ import { IconComponent } from "@uilib"; import { getPriorityType } from "@utils/helpers/getPriorityType"; import { TagComponent } from "../tag/tag.component"; import { ClickOutsideModule } from "ng-click-outside"; -import { CreateTagFormComponent } from "@office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component"; -import { TagDto } from "@office/projects/detail/kanban/models/dto/tag.model.dto"; +import { TagDto } from "../../../api/kanban/dto/tag.model.dto"; +import { CreateTagFormComponent } from "@ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component"; @Component({ selector: "app-dropdown", diff --git a/projects/social_platform/src/app/office/feed/filter/feed-filter.component.html b/projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.html similarity index 100% rename from projects/social_platform/src/app/office/feed/filter/feed-filter.component.html rename to projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.html diff --git a/projects/social_platform/src/app/office/feed/filter/feed-filter.component.scss b/projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.scss similarity index 100% rename from projects/social_platform/src/app/office/feed/filter/feed-filter.component.scss rename to projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.scss diff --git a/projects/social_platform/src/app/office/feed/filter/feed-filter.component.spec.ts b/projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/feed/filter/feed-filter.component.spec.ts rename to projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.spec.ts diff --git a/projects/social_platform/src/app/office/feed/filter/feed-filter.component.ts b/projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.ts similarity index 97% rename from projects/social_platform/src/app/office/feed/filter/feed-filter.component.ts rename to projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.ts index fa202026..4c104d2b 100644 --- a/projects/social_platform/src/app/office/feed/filter/feed-filter.component.ts +++ b/projects/social_platform/src/app/ui/components/feed-filter/feed-filter.component.ts @@ -13,11 +13,11 @@ import { import { ActivatedRoute, Router, RouterLink } from "@angular/router"; import { ButtonComponent, CheckboxComponent, IconComponent } from "@ui/components"; import { ClickOutsideModule } from "ng-click-outside"; -import { FeedService } from "@office/feed/services/feed.service"; -import { User } from "@auth/models/user.model"; -import { AuthService } from "@auth/services"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { Subscription } from "rxjs"; import { feedFilter } from "projects/core/src/consts/filters/feed-filter.const"; +import { AuthService } from "../../../api/auth"; +import { FeedService } from "../../../api/feed/feed.service"; /** * КОМПОНЕНТ ФИЛЬТРАЦИИ ЛЕНТЫ diff --git a/projects/social_platform/src/app/ui/components/file-item/file-item.component.ts b/projects/social_platform/src/app/ui/components/file-item/file-item.component.ts index 79d9d9d6..012bb151 100644 --- a/projects/social_platform/src/app/ui/components/file-item/file-item.component.ts +++ b/projects/social_platform/src/app/ui/components/file-item/file-item.component.ts @@ -3,8 +3,8 @@ import { Component, inject, Input, OnInit } from "@angular/core"; import { FileTypePipe } from "@ui/pipes/file-type.pipe"; import { IconComponent } from "@ui/components"; import { UpperCasePipe } from "@angular/common"; -import { FormatedFileSizePipe } from "@core/pipes/formatted-file-size.pipe"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; +import { FormatedFileSizePipe } from "projects/core/src/lib/pipes/transformers/formatted-file-size.pipe"; /** * Компонент для отображения информации о файле. diff --git a/projects/social_platform/src/app/ui/components/file-upload-item/file-upload-item.component.ts b/projects/social_platform/src/app/ui/components/file-upload-item/file-upload-item.component.ts index a07d56e9..5e633039 100644 --- a/projects/social_platform/src/app/ui/components/file-upload-item/file-upload-item.component.ts +++ b/projects/social_platform/src/app/ui/components/file-upload-item/file-upload-item.component.ts @@ -5,7 +5,7 @@ import { FileTypePipe } from "@ui/pipes/file-type.pipe"; import { LoaderComponent } from "../loader/loader.component"; import { IconComponent } from "@ui/components"; import { UpperCasePipe } from "@angular/common"; -import { FormatedFileSizePipe } from "@core/pipes/formatted-file-size.pipe"; +import { FormatedFileSizePipe } from "projects/core/src/lib/pipes/transformers/formatted-file-size.pipe"; /** * Компонент для отображения элемента загружаемого файла. diff --git a/projects/social_platform/src/app/office/features/info-card/info-card.component.html b/projects/social_platform/src/app/ui/components/info-card/info-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/info-card/info-card.component.html rename to projects/social_platform/src/app/ui/components/info-card/info-card.component.html diff --git a/projects/social_platform/src/app/office/features/info-card/info-card.component.scss b/projects/social_platform/src/app/ui/components/info-card/info-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/info-card/info-card.component.scss rename to projects/social_platform/src/app/ui/components/info-card/info-card.component.scss diff --git a/projects/social_platform/src/app/office/features/info-card/info-card.component.spec.ts b/projects/social_platform/src/app/ui/components/info-card/info-card.component.spec.ts similarity index 89% rename from projects/social_platform/src/app/office/features/info-card/info-card.component.spec.ts rename to projects/social_platform/src/app/ui/components/info-card/info-card.component.spec.ts index f2e3eb5e..45735c5a 100644 --- a/projects/social_platform/src/app/office/features/info-card/info-card.component.spec.ts +++ b/projects/social_platform/src/app/ui/components/info-card/info-card.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { of } from "rxjs"; -import { IndustryService } from "@services/industry.service"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; import { InfoCardComponent } from "./info-card.component"; describe("ProjectCardComponent", () => { diff --git a/projects/social_platform/src/app/office/features/info-card/info-card.component.ts b/projects/social_platform/src/app/ui/components/info-card/info-card.component.ts similarity index 94% rename from projects/social_platform/src/app/office/features/info-card/info-card.component.ts rename to projects/social_platform/src/app/ui/components/info-card/info-card.component.ts index e1fb4456..74c1eae9 100644 --- a/projects/social_platform/src/app/office/features/info-card/info-card.component.ts +++ b/projects/social_platform/src/app/ui/components/info-card/info-card.component.ts @@ -1,18 +1,18 @@ /** @format */ import { Component, EventEmitter, inject, Input, OnInit, Output, signal } from "@angular/core"; -import { IndustryService } from "@services/industry.service"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; import { IconComponent, ButtonComponent } from "@ui/components"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { AsyncPipe, CommonModule } from "@angular/common"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { SubscriptionService } from "@office/services/subscription.service"; -import { InviteService } from "@office/services/invite.service"; +import { SubscriptionService } from "projects/social_platform/src/app/api/subsriptions/subscription.service"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; import { ClickOutsideModule } from "ng-click-outside"; import { Router, RouterLink } from "@angular/router"; import { TagComponent } from "@ui/components/tag/tag.component"; import { YearsFromBirthdayPipe } from "@corelib"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; /** * Компонент карточки информации с разным наполнением, в зависимости от контекста diff --git a/projects/social_platform/src/app/office/features/invite-card/invite-card.component.html b/projects/social_platform/src/app/ui/components/invite-card/invite-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/invite-card/invite-card.component.html rename to projects/social_platform/src/app/ui/components/invite-card/invite-card.component.html diff --git a/projects/social_platform/src/app/office/features/invite-card/invite-card.component.scss b/projects/social_platform/src/app/ui/components/invite-card/invite-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/invite-card/invite-card.component.scss rename to projects/social_platform/src/app/ui/components/invite-card/invite-card.component.scss diff --git a/projects/social_platform/src/app/office/features/invite-card/invite-card.component.spec.ts b/projects/social_platform/src/app/ui/components/invite-card/invite-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/invite-card/invite-card.component.spec.ts rename to projects/social_platform/src/app/ui/components/invite-card/invite-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/invite-card/invite-card.component.ts b/projects/social_platform/src/app/ui/components/invite-card/invite-card.component.ts similarity index 93% rename from projects/social_platform/src/app/office/features/invite-card/invite-card.component.ts rename to projects/social_platform/src/app/ui/components/invite-card/invite-card.component.ts index 8afa5444..5c5e21e5 100644 --- a/projects/social_platform/src/app/office/features/invite-card/invite-card.component.ts +++ b/projects/social_platform/src/app/ui/components/invite-card/invite-card.component.ts @@ -3,13 +3,13 @@ import { Component, EventEmitter, Input, OnInit, Output, signal } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; import { ControlErrorPipe } from "@corelib"; -import { ErrorMessage } from "@error/models/error-message"; -import { Invite } from "@models/invite.model"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; import { IconComponent, ButtonComponent, SelectComponent, InputComponent } from "@ui/components"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { rolesMembersList } from "projects/core/src/consts/lists/roles-members-list.const"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; /** * Компонент карточки приглашения в команду или проект diff --git a/projects/social_platform/src/app/office/members/filters/members-filters.component.html b/projects/social_platform/src/app/ui/components/members-filters/members-filters.component.html similarity index 100% rename from projects/social_platform/src/app/office/members/filters/members-filters.component.html rename to projects/social_platform/src/app/ui/components/members-filters/members-filters.component.html diff --git a/projects/social_platform/src/app/office/members/filters/members-filters.component.scss b/projects/social_platform/src/app/ui/components/members-filters/members-filters.component.scss similarity index 100% rename from projects/social_platform/src/app/office/members/filters/members-filters.component.scss rename to projects/social_platform/src/app/ui/components/members-filters/members-filters.component.scss diff --git a/projects/social_platform/src/app/office/members/filters/members-filters.component.spec.ts b/projects/social_platform/src/app/ui/components/members-filters/members-filters.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/members/filters/members-filters.component.spec.ts rename to projects/social_platform/src/app/ui/components/members-filters/members-filters.component.spec.ts diff --git a/projects/social_platform/src/app/office/members/filters/members-filters.component.ts b/projects/social_platform/src/app/ui/components/members-filters/members-filters.component.ts similarity index 92% rename from projects/social_platform/src/app/office/members/filters/members-filters.component.ts rename to projects/social_platform/src/app/ui/components/members-filters/members-filters.component.ts index 11a96157..9877076c 100644 --- a/projects/social_platform/src/app/office/members/filters/members-filters.component.ts +++ b/projects/social_platform/src/app/ui/components/members-filters/members-filters.component.ts @@ -10,15 +10,15 @@ import { signal, } from "@angular/core"; import { RangeInputComponent } from "@ui/components/range-input/range-input.component"; -import { MembersComponent } from "@office/members/members.component"; import { ReactiveFormsModule } from "@angular/forms"; import { AutoCompleteInputComponent } from "@ui/components/autocomplete-input/autocomplete-input.component"; -import { Specialization } from "@office/models/specialization"; -import { SpecializationsService } from "@office/services/specializations.service"; -import { SkillsService } from "@office/services/skills.service"; -import { Skill } from "@office/models/skill"; +import { Specialization } from "projects/social_platform/src/app/domain/specializations/specialization"; import { ActivatedRoute, Router } from "@angular/router"; -import { CheckboxComponent } from "../../../ui/components/checkbox/checkbox.component"; +import { CheckboxComponent } from "../checkbox/checkbox.component"; +import { MembersComponent } from "@ui/pages/members/members.component"; +import { Skill } from "../../../domain/skills/skill"; +import { SkillsService } from "../../../api/skills/skills.service"; +import { SpecializationsService } from "../../../api/specializations/specializations.service"; /** * Компонент фильтров для списка участников diff --git a/projects/social_platform/src/app/office/features/message-input/message-input.component.html b/projects/social_platform/src/app/ui/components/message-input/message-input.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/message-input/message-input.component.html rename to projects/social_platform/src/app/ui/components/message-input/message-input.component.html diff --git a/projects/social_platform/src/app/office/features/message-input/message-input.component.scss b/projects/social_platform/src/app/ui/components/message-input/message-input.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/message-input/message-input.component.scss rename to projects/social_platform/src/app/ui/components/message-input/message-input.component.scss diff --git a/projects/social_platform/src/app/office/features/message-input/message-input.component.spec.ts b/projects/social_platform/src/app/ui/components/message-input/message-input.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/message-input/message-input.component.spec.ts rename to projects/social_platform/src/app/ui/components/message-input/message-input.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/message-input/message-input.component.ts b/projects/social_platform/src/app/ui/components/message-input/message-input.component.ts similarity index 97% rename from projects/social_platform/src/app/office/features/message-input/message-input.component.ts rename to projects/social_platform/src/app/ui/components/message-input/message-input.component.ts index ccabd06e..f67c4996 100644 --- a/projects/social_platform/src/app/office/features/message-input/message-input.component.ts +++ b/projects/social_platform/src/app/ui/components/message-input/message-input.component.ts @@ -10,15 +10,15 @@ import { Output, } from "@angular/core"; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms"; -import { ChatMessage } from "@models/chat-message.model"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; import { fromEvent, map, Subscription } from "rxjs"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; import { FileTypePipe } from "@ui/pipes/file-type.pipe"; import { AutosizeModule } from "ngx-autosize"; import { NgxMaskModule } from "ngx-mask"; import { IconComponent } from "@ui/components"; -import { FormatedFileSizePipe } from "@core/pipes/formatted-file-size.pipe"; import { UpperCasePipe } from "@angular/common"; +import { FormatedFileSizePipe } from "projects/core/src/lib/pipes/transformers/formatted-file-size.pipe"; /** * Компонент ввода сообщений для чата diff --git a/projects/social_platform/src/app/office/features/nav/nav.component.html b/projects/social_platform/src/app/ui/components/nav/nav.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/nav/nav.component.html rename to projects/social_platform/src/app/ui/components/nav/nav.component.html diff --git a/projects/social_platform/src/app/office/features/nav/nav.component.scss b/projects/social_platform/src/app/ui/components/nav/nav.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/nav/nav.component.scss rename to projects/social_platform/src/app/ui/components/nav/nav.component.scss diff --git a/projects/social_platform/src/app/office/features/nav/nav.component.spec.ts b/projects/social_platform/src/app/ui/components/nav/nav.component.spec.ts similarity index 91% rename from projects/social_platform/src/app/office/features/nav/nav.component.spec.ts rename to projects/social_platform/src/app/ui/components/nav/nav.component.spec.ts index 8d4262dc..29bf6916 100644 --- a/projects/social_platform/src/app/office/features/nav/nav.component.spec.ts +++ b/projects/social_platform/src/app/ui/components/nav/nav.component.spec.ts @@ -6,7 +6,7 @@ import { NavComponent } from "./nav.component"; import { RouterTestingModule } from "@angular/router/testing"; import { of } from "rxjs"; import { AuthService } from "@auth/services"; -import { InviteService } from "@services/invite.service"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; describe("NavComponent", () => { let component: NavComponent; diff --git a/projects/social_platform/src/app/office/features/nav/nav.component.ts b/projects/social_platform/src/app/ui/components/nav/nav.component.ts similarity index 93% rename from projects/social_platform/src/app/office/features/nav/nav.component.ts rename to projects/social_platform/src/app/ui/components/nav/nav.component.ts index 47742dc9..6379e33e 100644 --- a/projects/social_platform/src/app/office/features/nav/nav.component.ts +++ b/projects/social_platform/src/app/ui/components/nav/nav.component.ts @@ -1,16 +1,16 @@ /** @format */ import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from "@angular/core"; -import { NavService } from "@services/nav.service"; +import { NavService } from "@ui/services/nav/nav.service"; import { NavigationStart, Router, RouterLink, RouterLinkActive } from "@angular/router"; import { noop, Subscription } from "rxjs"; -import { NotificationService } from "@services/notification.service"; -import { Invite } from "@models/invite.model"; -import { AuthService } from "@auth/services"; -import { InviteService } from "@services/invite.service"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; import { AsyncPipe } from "@angular/common"; import { IconComponent } from "@ui/components"; import { InviteManageCardComponent, ProfileInfoComponent } from "@uilib"; +import { AuthService } from "../../../api/auth"; +import { NotificationService } from "@ui/services/notification/notification.service"; /** * Компонент навигационного меню diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.html b/projects/social_platform/src/app/ui/components/news-card/news-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/news-card/news-card.component.html rename to projects/social_platform/src/app/ui/components/news-card/news-card.component.html diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.scss b/projects/social_platform/src/app/ui/components/news-card/news-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/news-card/news-card.component.scss rename to projects/social_platform/src/app/ui/components/news-card/news-card.component.scss diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.spec.ts b/projects/social_platform/src/app/ui/components/news-card/news-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/news-card/news-card.component.spec.ts rename to projects/social_platform/src/app/ui/components/news-card/news-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/news-card/news-card.component.ts b/projects/social_platform/src/app/ui/components/news-card/news-card.component.ts similarity index 89% rename from projects/social_platform/src/app/office/features/news-card/news-card.component.ts rename to projects/social_platform/src/app/ui/components/news-card/news-card.component.ts index 29cc4b86..c6de4823 100644 --- a/projects/social_platform/src/app/office/features/news-card/news-card.component.ts +++ b/projects/social_platform/src/app/ui/components/news-card/news-card.component.ts @@ -8,10 +8,10 @@ import { Input, OnInit, Output, + signal, ViewChild, } from "@angular/core"; -import { FeedNews } from "@office/projects/models/project-news.model"; -import { SnackbarService } from "@ui/services/snackbar.service"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; import { ActivatedRoute, RouterLink } from "@angular/router"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { @@ -21,19 +21,20 @@ import { ParseLinksPipe, ValidationService, } from "projects/core"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; import { nanoid } from "nanoid"; import { expandElement } from "@utils/expand-element"; -import { FileModel } from "@models/file.model"; -import { forkJoin, noop, Observable, tap } from "rxjs"; +import { FileModel } from "projects/social_platform/src/app/domain/file/file.model"; +import { forkJoin, noop, Observable, Subscription, take, tap } from "rxjs"; import { ButtonComponent, IconComponent } from "@ui/components"; import { FileItemComponent } from "@ui/components/file-item/file-item.component"; import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; import { ClickOutsideModule } from "ng-click-outside"; -import { CarouselComponent } from "@office/shared/carousel/carousel.component"; -import { ImgCardComponent } from "@office/shared/img-card/img-card.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { CarouselComponent } from "@ui/shared/carousel/carousel.component"; +import { ImgCardComponent } from "@ui/shared/img-card/img-card.component"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { FeedNews } from "../../../domain/project/project-news.model"; @Component({ selector: "app-news-card", @@ -88,10 +89,14 @@ export class NewsCardComponent implements OnInit { editMode = false; editForm: FormGroup; + private profileId = signal(0); + // Оригинальные списки (не изменяются во время редактирования) imagesViewList: FileModel[] = []; filesViewList: FileModel[] = []; + private readonly subscription: Subscription[] = []; + // Списки для редактирования imagesEditList: { id: string; @@ -146,9 +151,21 @@ export class NewsCardComponent implements OnInit { return type !== "image" && f.mimeType !== "x-empty"; }); + const profileIdParams$ = this.route.params.pipe(take(1)).subscribe({ + next: q => { + this.profileId.set(q["id"]); + }, + }); + + this.subscription.push(profileIdParams$); + this.initEditLists(); } + ngOnDestroy(): void { + this.subscription.forEach($ => $.unsubscribe()); + } + /** * Инициализация списков редактирования из текущих данных */ @@ -181,12 +198,15 @@ export class NewsCardComponent implements OnInit { onCopyLink(): void { const isProject = this.resourceLink[0].toString().includes("projects"); + const isProfile = this.resourceLink[0].toString().includes("profile"); let fullUrl = ""; if (isProject) { fullUrl = `${location.origin}/office/projects/${this.contentId}/news/${this.feedItem.id}`; } else { - fullUrl = `${location.origin}/office/profile/${this.contentId}/news/${this.feedItem.id}`; + fullUrl = `${location.origin}/office/profile/${this.profileId() || this.contentId}/news/${ + this.feedItem.id + }`; } navigator.clipboard.writeText(fullUrl).then(() => { diff --git a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.html b/projects/social_platform/src/app/ui/components/news-detail/news-detail.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.html rename to projects/social_platform/src/app/ui/components/news-detail/news-detail.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.scss b/projects/social_platform/src/app/ui/components/news-detail/news-detail.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.scss rename to projects/social_platform/src/app/ui/components/news-detail/news-detail.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.spec.ts b/projects/social_platform/src/app/ui/components/news-detail/news-detail.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.spec.ts rename to projects/social_platform/src/app/ui/components/news-detail/news-detail.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.ts b/projects/social_platform/src/app/ui/components/news-detail/news-detail.component.ts similarity index 95% rename from projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.ts rename to projects/social_platform/src/app/ui/components/news-detail/news-detail.component.ts index 5baee27b..67fa9faf 100644 --- a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.component.ts +++ b/projects/social_platform/src/app/ui/components/news-detail/news-detail.component.ts @@ -3,10 +3,10 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { map, Observable } from "rxjs"; -import { FeedNews } from "@office/projects/models/project-news.model"; import { AsyncPipe } from "@angular/common"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { NewsCardComponent } from "@office/features/news-card/news-card.component"; +import { NewsCardComponent } from "@ui/components/news-card/news-card.component"; +import { FeedNews } from "../../../domain/project/project-news.model"; /** * КОМПОНЕНТ ДЕТАЛЬНОЙ НОВОСТИ diff --git a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.resolver.spec.ts b/projects/social_platform/src/app/ui/components/news-detail/news-detail.resolver.spec.ts similarity index 92% rename from projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.resolver.spec.ts rename to projects/social_platform/src/app/ui/components/news-detail/news-detail.resolver.spec.ts index fec798de..36b9add7 100644 --- a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.resolver.spec.ts +++ b/projects/social_platform/src/app/ui/components/news-detail/news-detail.resolver.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from "@angular/core/testing"; import { NewsDetailResolver } from "./news-detail.resolver"; import { HttpClientTestingModule } from "@angular/common/http/testing"; -import { ProjectNewsService } from "../services/project-news.service"; +import { ProjectNewsService } from "../../../../../api/project-news.service"; import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router"; import { of } from "rxjs"; diff --git a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.resolver.ts b/projects/social_platform/src/app/ui/components/news-detail/news-detail.resolver.ts similarity index 93% rename from projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.resolver.ts rename to projects/social_platform/src/app/ui/components/news-detail/news-detail.resolver.ts index 4ed78a26..ba137819 100644 --- a/projects/social_platform/src/app/office/projects/detail/news-detail/news-detail.resolver.ts +++ b/projects/social_platform/src/app/ui/components/news-detail/news-detail.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { ProjectNewsService } from "@office/projects/detail/services/project-news.service"; -import { FeedNews } from "@office/projects/models/project-news.model"; +import { FeedNews } from "../../../domain/project/project-news.model"; +import { ProjectNewsService } from "../../../api/project/project-news.service"; /** * РЕЗОЛВЕР ДЛЯ ЗАГРУЗКИ ДЕТАЛЬНОЙ ИНФОРМАЦИИ О НОВОСТИ diff --git a/projects/social_platform/src/app/office/features/news-form/news-form.component.html b/projects/social_platform/src/app/ui/components/news-form/news-form.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/news-form/news-form.component.html rename to projects/social_platform/src/app/ui/components/news-form/news-form.component.html diff --git a/projects/social_platform/src/app/office/features/news-form/news-form.component.scss b/projects/social_platform/src/app/ui/components/news-form/news-form.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/news-form/news-form.component.scss rename to projects/social_platform/src/app/ui/components/news-form/news-form.component.scss diff --git a/projects/social_platform/src/app/office/features/news-form/news-form.component.spec.ts b/projects/social_platform/src/app/ui/components/news-form/news-form.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/news-form/news-form.component.spec.ts rename to projects/social_platform/src/app/ui/components/news-form/news-form.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/news-form/news-form.component.ts b/projects/social_platform/src/app/ui/components/news-form/news-form.component.ts similarity index 97% rename from projects/social_platform/src/app/office/features/news-form/news-form.component.ts rename to projects/social_platform/src/app/ui/components/news-form/news-form.component.ts index 0403349f..6a1abc81 100644 --- a/projects/social_platform/src/app/office/features/news-form/news-form.component.ts +++ b/projects/social_platform/src/app/ui/components/news-form/news-form.component.ts @@ -4,12 +4,12 @@ import { Component, EventEmitter, OnInit, Output } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { ValidationService } from "projects/core"; import { nanoid } from "nanoid"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; import { forkJoin, noop, Observable, tap } from "rxjs"; import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component"; import { IconComponent, InputComponent } from "@ui/components"; import { AutosizeModule } from "ngx-autosize"; -import { ImgCardComponent } from "@office/shared/img-card/img-card.component"; +import { ImgCardComponent } from "@ui/shared/img-card/img-card.component"; /** * Компонент формы создания новости diff --git a/projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.html b/projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.html similarity index 100% rename from projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.html rename to projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.html diff --git a/projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.scss b/projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.scss rename to projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.scss diff --git a/projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.spec.ts b/projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.spec.ts similarity index 62% rename from projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.spec.ts rename to projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.spec.ts index 70eca8f8..8c9d3a40 100644 --- a/projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.spec.ts +++ b/projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.spec.ts @@ -2,22 +2,22 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ProjectsFilterComponent } from "./projects-filter.component"; import { RouterTestingModule } from "@angular/router/testing"; import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { ProgramProjectsFilterComponent } from "./program-projects-filter.component"; describe("ProjectsFilterComponent", () => { - let component: ProjectsFilterComponent; - let fixture: ComponentFixture; + let component: ProgramProjectsFilterComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [RouterTestingModule, HttpClientTestingModule, ProjectsFilterComponent], + imports: [RouterTestingModule, HttpClientTestingModule], }).compileComponents(); }); beforeEach(() => { - fixture = TestBed.createComponent(ProjectsFilterComponent); + fixture = TestBed.createComponent(ProgramProjectsFilterComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.ts b/projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.ts similarity index 94% rename from projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.ts rename to projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.ts index beafb5ac..20a1d038 100644 --- a/projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.ts +++ b/projects/social_platform/src/app/ui/components/program-projects-filter/program-projects-filter.component.ts @@ -5,9 +5,8 @@ import { ActivatedRoute, Router } from "@angular/router"; import { debounceTime, distinctUntilChanged, filter, map, Subscription } from "rxjs"; import { SwitchComponent } from "@ui/components/switch/switch.component"; import { CheckboxComponent, SelectComponent } from "@ui/components"; -import { ProgramService } from "@office/program/services/program.service"; -import { PartnerProgramFields } from "@office/models/partner-program-fields.model"; -import { ToSelectOptionsPipe } from "projects/core/src/lib/pipes/options-transform.pipe"; +import { PartnerProgramFields } from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { ToSelectOptionsPipe } from "projects/core/src/lib/pipes/transformers/options-transform.pipe"; import { CommonModule } from "@angular/common"; import { FormBuilder, @@ -16,6 +15,7 @@ import { ReactiveFormsModule, Validators, } from "@angular/forms"; +import { ProgramService } from "../../../api/program/program.service"; /** * Компонент фильтрации проектов @@ -44,9 +44,9 @@ import { * - Адаптивный интерфейс для мобильных устройств */ @Component({ - selector: "app-projects-filter", - templateUrl: "./projects-filter.component.html", - styleUrl: "./projects-filter.component.scss", + selector: "app-program-projects-filter", + templateUrl: "./program-projects-filter.component.html", + styleUrl: "./program-projects-filter.component.scss", standalone: true, imports: [ CommonModule, @@ -57,7 +57,7 @@ import { ToSelectOptionsPipe, ], }) -export class ProjectsFilterComponent implements OnInit { +export class ProgramProjectsFilterComponent implements OnInit { constructor( private readonly route: ActivatedRoute, private readonly router: Router, diff --git a/projects/social_platform/src/app/office/features/project-rating/components/boolean-criterion/boolean-criterion.component.html b/projects/social_platform/src/app/ui/components/project-rating/components/boolean-criterion/boolean-criterion.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/components/boolean-criterion/boolean-criterion.component.html rename to projects/social_platform/src/app/ui/components/project-rating/components/boolean-criterion/boolean-criterion.component.html diff --git a/projects/social_platform/src/app/office/features/project-rating/components/boolean-criterion/boolean-criterion.component.scss b/projects/social_platform/src/app/ui/components/project-rating/components/boolean-criterion/boolean-criterion.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/components/boolean-criterion/boolean-criterion.component.scss rename to projects/social_platform/src/app/ui/components/project-rating/components/boolean-criterion/boolean-criterion.component.scss diff --git a/projects/social_platform/src/app/office/features/project-rating/components/boolean-criterion/boolean-criterion.component.ts b/projects/social_platform/src/app/ui/components/project-rating/components/boolean-criterion/boolean-criterion.component.ts similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/components/boolean-criterion/boolean-criterion.component.ts rename to projects/social_platform/src/app/ui/components/project-rating/components/boolean-criterion/boolean-criterion.component.ts diff --git a/projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.html b/projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.html rename to projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.html diff --git a/projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.scss b/projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.scss rename to projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.scss diff --git a/projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.spec.ts b/projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.spec.ts rename to projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.ts b/projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.ts similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/components/range-criterion-input/range-criterion-input.component.ts rename to projects/social_platform/src/app/ui/components/project-rating/components/range-criterion-input/range-criterion-input.component.ts diff --git a/projects/social_platform/src/app/office/features/project-rating/project-rating.component.html b/projects/social_platform/src/app/ui/components/project-rating/project-rating.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/project-rating.component.html rename to projects/social_platform/src/app/ui/components/project-rating/project-rating.component.html diff --git a/projects/social_platform/src/app/office/features/project-rating/project-rating.component.scss b/projects/social_platform/src/app/ui/components/project-rating/project-rating.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/project-rating/project-rating.component.scss rename to projects/social_platform/src/app/ui/components/project-rating/project-rating.component.scss diff --git a/projects/social_platform/src/app/office/features/project-rating/project-rating.component.ts b/projects/social_platform/src/app/ui/components/project-rating/project-rating.component.ts similarity index 97% rename from projects/social_platform/src/app/office/features/project-rating/project-rating.component.ts rename to projects/social_platform/src/app/ui/components/project-rating/project-rating.component.ts index ab008d29..4fd49bed 100644 --- a/projects/social_platform/src/app/office/features/project-rating/project-rating.component.ts +++ b/projects/social_platform/src/app/ui/components/project-rating/project-rating.component.ts @@ -22,11 +22,11 @@ import { AbstractControl, } from "@angular/forms"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; -import { ProjectRatingCriterion } from "@office/program/models/project-rating-criterion"; import { noop, Subscription } from "rxjs"; import { BooleanCriterionComponent } from "./components/boolean-criterion/boolean-criterion.component"; import { RangeCriterionInputComponent } from "./components/range-criterion-input/range-criterion-input.component"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ProjectRatingCriterion } from "../../../domain/project/project-rating-criterion"; /** * Компонент рейтинга проекта diff --git a/projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.html b/projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.html rename to projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.html diff --git a/projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.scss b/projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.scss rename to projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.scss diff --git a/projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.spec.ts b/projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.spec.ts rename to projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.ts b/projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.ts similarity index 98% rename from projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.ts rename to projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.ts index 99ac9784..59a31ef6 100644 --- a/projects/social_platform/src/app/office/projects/projects-filter/projects-filter.component.ts +++ b/projects/social_platform/src/app/ui/components/projects-filter/projects-filter.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { map, Subscription } from "rxjs"; -import { IndustryService } from "@services/industry.service"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; import { SelectComponent } from "@ui/components"; import { FormControl, ReactiveFormsModule } from "@angular/forms"; import { tagsFilter } from "projects/core/src/consts/filters/tags-filter.const"; diff --git a/projects/social_platform/src/app/office/features/response-card/response-card.component.html b/projects/social_platform/src/app/ui/components/response-card/response-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/response-card/response-card.component.html rename to projects/social_platform/src/app/ui/components/response-card/response-card.component.html diff --git a/projects/social_platform/src/app/office/features/response-card/response-card.component.scss b/projects/social_platform/src/app/ui/components/response-card/response-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/response-card/response-card.component.scss rename to projects/social_platform/src/app/ui/components/response-card/response-card.component.scss diff --git a/projects/social_platform/src/app/office/features/response-card/response-card.component.spec.ts b/projects/social_platform/src/app/ui/components/response-card/response-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/response-card/response-card.component.spec.ts rename to projects/social_platform/src/app/ui/components/response-card/response-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/response-card/response-card.component.ts b/projects/social_platform/src/app/ui/components/response-card/response-card.component.ts similarity index 81% rename from projects/social_platform/src/app/office/features/response-card/response-card.component.ts rename to projects/social_platform/src/app/ui/components/response-card/response-card.component.ts index 1f7acaca..8c0c12ca 100644 --- a/projects/social_platform/src/app/office/features/response-card/response-card.component.ts +++ b/projects/social_platform/src/app/ui/components/response-card/response-card.component.ts @@ -1,17 +1,10 @@ /** @format */ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { VacancyResponse } from "@models/vacancy-response.model"; -import { UserRolePipe } from "@core/pipes/user-role.pipe"; -import { ButtonComponent } from "@ui/components"; -import { TagComponent } from "@ui/components/tag/tag.component"; -import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { RouterLink } from "@angular/router"; -import { AsyncPipe } from "@angular/common"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; import { FileItemComponent } from "@ui/components/file-item/file-item.component"; -import { AuthService } from "@auth/services"; -import { ProjectVacancyCardComponent } from "@office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component"; import { IconComponent } from "@uilib"; +import { AuthService } from "../../../api/auth"; /** * Компонент карточки отклика на вакансию diff --git a/projects/social_platform/src/app/ui/components/snackbar/snackbar.component.ts b/projects/social_platform/src/app/ui/components/snackbar/snackbar.component.ts index abb77f14..2319fff8 100644 --- a/projects/social_platform/src/app/ui/components/snackbar/snackbar.component.ts +++ b/projects/social_platform/src/app/ui/components/snackbar/snackbar.component.ts @@ -1,10 +1,10 @@ /** @format */ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { SnackbarService } from "@ui/services/snackbar.service"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; import { Snack } from "@ui/models/snack.model"; import { Subscription } from "rxjs"; -import { AnimationService } from "@ui/services/animation.service"; +import { AnimationService } from "@ui/services/animation/animation.service"; import { CommonModule } from "@angular/common"; import { IconComponent } from "@uilib"; diff --git a/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.spec.ts b/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.spec.ts index c00643ec..a155d6fe 100644 --- a/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.spec.ts +++ b/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { FormsModule } from "@angular/forms"; import { UploadFileComponent } from "./upload-file.component"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; import { of } from "rxjs"; describe("UploadFileComponent", () => { diff --git a/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.ts b/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.ts index d358c2a0..8fe70f2c 100644 --- a/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.ts +++ b/projects/social_platform/src/app/ui/components/upload-file/upload-file.component.ts @@ -2,7 +2,7 @@ import { Component, forwardRef, Input, OnInit } from "@angular/core"; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; import { nanoid } from "nanoid"; import { IconComponent } from "@ui/components"; import { SlicePipe } from "@angular/common"; diff --git a/projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.html b/projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.html rename to projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.html diff --git a/projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.scss b/projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.scss rename to projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.scss diff --git a/projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.spec.ts b/projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.spec.ts rename to projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.ts b/projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.ts similarity index 93% rename from projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.ts rename to projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.ts index 03e2538d..50c17c0e 100644 --- a/projects/social_platform/src/app/office/features/vacancy-card/vacancy-card.component.ts +++ b/projects/social_platform/src/app/ui/components/vacancy-card/vacancy-card.component.ts @@ -1,10 +1,10 @@ /** @format */ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { Vacancy } from "@models/vacancy.model"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; import { IconComponent, ButtonComponent } from "@ui/components"; import { TagComponent } from "@ui/components/tag/tag.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; /** * Компонент карточки вакансии diff --git a/projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.html b/projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.html similarity index 100% rename from projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.html rename to projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.html diff --git a/projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.scss b/projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.scss similarity index 100% rename from projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.scss rename to projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.scss diff --git a/projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.spec.ts b/projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.spec.ts rename to projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.spec.ts diff --git a/projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.ts b/projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.ts similarity index 98% rename from projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.ts rename to projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.ts index 3ce19cde..c15b995d 100644 --- a/projects/social_platform/src/app/office/vacancies/shared/filter/vacancy-filter.component.ts +++ b/projects/social_platform/src/app/ui/components/vacancy-filter/vacancy-filter.component.ts @@ -15,12 +15,12 @@ import { import { ActivatedRoute, Router, RouterLink } from "@angular/router"; import { ButtonComponent, CheckboxComponent, IconComponent } from "@ui/components"; import { ClickOutsideModule } from "ng-click-outside"; -import { FeedService } from "@office/feed/services/feed.service"; -import { VacancyService } from "@office/services/vacancy.service"; import { map, Subscription, tap } from "rxjs"; import { workFormatFilter } from "projects/core/src/consts/filters/work-format-filter.const"; import { workScheduleFilter } from "projects/core/src/consts/filters/work-schedule-filter.const"; import { workExperienceFilter } from "projects/core/src/consts/filters/work-experience-filter.const"; +import { FeedService } from "../../../api/feed/feed.service"; +import { VacancyService } from "../../../api/vacancy/vacancy.service"; /** * Компонент фильтра вакансий без использования реактивных форм diff --git a/projects/social_platform/src/app/auth/README.md b/projects/social_platform/src/app/ui/pages/auth/README.md similarity index 100% rename from projects/social_platform/src/app/auth/README.md rename to projects/social_platform/src/app/ui/pages/auth/README.md diff --git a/projects/social_platform/src/app/auth/auth.component.html b/projects/social_platform/src/app/ui/pages/auth/auth.component.html similarity index 100% rename from projects/social_platform/src/app/auth/auth.component.html rename to projects/social_platform/src/app/ui/pages/auth/auth.component.html diff --git a/projects/social_platform/src/app/auth/auth.component.scss b/projects/social_platform/src/app/ui/pages/auth/auth.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/auth.component.scss rename to projects/social_platform/src/app/ui/pages/auth/auth.component.scss diff --git a/projects/social_platform/src/app/auth/auth.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/auth.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/auth/auth.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/auth.component.spec.ts diff --git a/projects/social_platform/src/app/auth/auth.component.ts b/projects/social_platform/src/app/ui/pages/auth/auth.component.ts similarity index 100% rename from projects/social_platform/src/app/auth/auth.component.ts rename to projects/social_platform/src/app/ui/pages/auth/auth.component.ts diff --git a/projects/social_platform/src/app/auth/confirm-email/confirm-email.component.html b/projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.html similarity index 100% rename from projects/social_platform/src/app/auth/confirm-email/confirm-email.component.html rename to projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.html diff --git a/projects/social_platform/src/app/auth/confirm-email/confirm-email.component.scss b/projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/confirm-email/confirm-email.component.scss rename to projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.scss diff --git a/projects/social_platform/src/app/auth/confirm-email/confirm-email.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.spec.ts similarity index 94% rename from projects/social_platform/src/app/auth/confirm-email/confirm-email.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.spec.ts index 20969d34..fbc62932 100644 --- a/projects/social_platform/src/app/auth/confirm-email/confirm-email.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { ConfirmEmailComponent } from "./confirm-email.component"; -import { AuthService } from "../services"; +import { AuthService } from "../../../../auth/services"; import { RouterTestingModule } from "@angular/router/testing"; describe("ConfirmEmailComponent", () => { diff --git a/projects/social_platform/src/app/auth/confirm-email/confirm-email.component.ts b/projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.ts similarity index 100% rename from projects/social_platform/src/app/auth/confirm-email/confirm-email.component.ts rename to projects/social_platform/src/app/ui/pages/auth/confirm-email/confirm-email.component.ts diff --git a/projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.html b/projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.html similarity index 100% rename from projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.html rename to projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.html diff --git a/projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.scss b/projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.scss rename to projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.scss diff --git a/projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.spec.ts diff --git a/projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.ts b/projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.ts similarity index 100% rename from projects/social_platform/src/app/auth/confirm-password-reset/confirm-password-reset.component.ts rename to projects/social_platform/src/app/ui/pages/auth/confirm-password-reset/confirm-password-reset.component.ts diff --git a/projects/social_platform/src/app/auth/email-verification/email-verification.component.html b/projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.html similarity index 100% rename from projects/social_platform/src/app/auth/email-verification/email-verification.component.html rename to projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.html diff --git a/projects/social_platform/src/app/auth/email-verification/email-verification.component.scss b/projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/email-verification/email-verification.component.scss rename to projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.scss diff --git a/projects/social_platform/src/app/auth/email-verification/email-verification.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.spec.ts similarity index 94% rename from projects/social_platform/src/app/auth/email-verification/email-verification.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.spec.ts index 4ed40018..9f34ecaa 100644 --- a/projects/social_platform/src/app/auth/email-verification/email-verification.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { EmailVerificationComponent } from "./email-verification.component"; import { RouterTestingModule } from "@angular/router/testing"; -import { AuthService } from "../services"; +import { AuthService } from "../../../../auth/services"; describe("EmailVerificationComponent", () => { let component: EmailVerificationComponent; diff --git a/projects/social_platform/src/app/auth/email-verification/email-verification.component.ts b/projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.ts similarity index 96% rename from projects/social_platform/src/app/auth/email-verification/email-verification.component.ts rename to projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.ts index 16a3319f..80a40507 100644 --- a/projects/social_platform/src/app/auth/email-verification/email-verification.component.ts +++ b/projects/social_platform/src/app/ui/pages/auth/email-verification/email-verification.component.ts @@ -3,8 +3,8 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { filter, interval, map, noop, Observable, Subscription } from "rxjs"; -import { AuthService } from "@auth/services"; import { IconComponent } from "@ui/components"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * Компонент подтверждения email адреса diff --git a/projects/social_platform/src/app/auth/login/login.component.html b/projects/social_platform/src/app/ui/pages/auth/login/login.component.html similarity index 100% rename from projects/social_platform/src/app/auth/login/login.component.html rename to projects/social_platform/src/app/ui/pages/auth/login/login.component.html diff --git a/projects/social_platform/src/app/auth/login/login.component.scss b/projects/social_platform/src/app/ui/pages/auth/login/login.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/login/login.component.scss rename to projects/social_platform/src/app/ui/pages/auth/login/login.component.scss diff --git a/projects/social_platform/src/app/auth/login/login.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/login/login.component.spec.ts similarity index 95% rename from projects/social_platform/src/app/auth/login/login.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/login/login.component.spec.ts index 12b131c2..19807f60 100644 --- a/projects/social_platform/src/app/auth/login/login.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/auth/login/login.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { LoginComponent } from "./login.component"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { AuthService } from "../services"; +import { AuthService } from "../../../../auth/services"; import { InputComponent } from "@ui/components"; import { RouterTestingModule } from "@angular/router/testing"; import { NgxMaskModule } from "ngx-mask"; diff --git a/projects/social_platform/src/app/auth/login/login.component.ts b/projects/social_platform/src/app/ui/pages/auth/login/login.component.ts similarity index 96% rename from projects/social_platform/src/app/auth/login/login.component.ts rename to projects/social_platform/src/app/ui/pages/auth/login/login.component.ts index fa3ab682..c15bc58c 100644 --- a/projects/social_platform/src/app/auth/login/login.component.ts +++ b/projects/social_platform/src/app/ui/pages/auth/login/login.component.ts @@ -2,12 +2,12 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { AuthService } from "../services"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { ControlErrorPipe, TokenService, ValidationService } from "projects/core"; import { ActivatedRoute, Router, RouterLink } from "@angular/router"; import { ButtonComponent, IconComponent, InputComponent } from "@ui/components"; import { CommonModule } from "@angular/common"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * Компонент входа в систему diff --git a/projects/social_platform/src/app/auth/register/register.component.html b/projects/social_platform/src/app/ui/pages/auth/register/register.component.html similarity index 100% rename from projects/social_platform/src/app/auth/register/register.component.html rename to projects/social_platform/src/app/ui/pages/auth/register/register.component.html diff --git a/projects/social_platform/src/app/auth/register/register.component.scss b/projects/social_platform/src/app/ui/pages/auth/register/register.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/register/register.component.scss rename to projects/social_platform/src/app/ui/pages/auth/register/register.component.scss diff --git a/projects/social_platform/src/app/auth/register/register.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/register/register.component.spec.ts similarity index 95% rename from projects/social_platform/src/app/auth/register/register.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/register/register.component.spec.ts index fd1a9477..00d3064d 100644 --- a/projects/social_platform/src/app/auth/register/register.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/auth/register/register.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { RegisterComponent } from "./register.component"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { AuthService } from "../services"; +import { AuthService } from "../../../../auth/services"; import { InputComponent } from "@ui/components"; import { NgxMaskModule } from "ngx-mask"; import { RouterTestingModule } from "@angular/router/testing"; diff --git a/projects/social_platform/src/app/auth/register/register.component.ts b/projects/social_platform/src/app/ui/pages/auth/register/register.component.ts similarity index 97% rename from projects/social_platform/src/app/auth/register/register.component.ts rename to projects/social_platform/src/app/ui/pages/auth/register/register.component.ts index 1aff07cc..acd13f27 100644 --- a/projects/social_platform/src/app/auth/register/register.component.ts +++ b/projects/social_platform/src/app/ui/pages/auth/register/register.component.ts @@ -3,15 +3,15 @@ import { ChangeDetectorRef, Component, OnInit } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { ControlErrorPipe, TokenService, ValidationService } from "projects/core"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { Router, RouterLink } from "@angular/router"; import * as dayjs from "dayjs"; import * as cpf from "dayjs/plugin/customParseFormat"; import { ButtonComponent, CheckboxComponent, InputComponent } from "@ui/components"; -import { AuthService } from "@auth/services"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { IconComponent } from "@uilib"; import { CommonModule } from "@angular/common"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; dayjs.extend(cpf); diff --git a/projects/social_platform/src/app/auth/reset-password/reset-password.component.html b/projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.html similarity index 100% rename from projects/social_platform/src/app/auth/reset-password/reset-password.component.html rename to projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.html diff --git a/projects/social_platform/src/app/auth/reset-password/reset-password.component.scss b/projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/reset-password/reset-password.component.scss rename to projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.scss diff --git a/projects/social_platform/src/app/auth/reset-password/reset-password.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/auth/reset-password/reset-password.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.spec.ts diff --git a/projects/social_platform/src/app/auth/reset-password/reset-password.component.ts b/projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.ts similarity index 94% rename from projects/social_platform/src/app/auth/reset-password/reset-password.component.ts rename to projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.ts index 2d8dce1d..fc5d3678 100644 --- a/projects/social_platform/src/app/auth/reset-password/reset-password.component.ts +++ b/projects/social_platform/src/app/ui/pages/auth/reset-password/reset-password.component.ts @@ -2,11 +2,11 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { ErrorMessage } from "@error/models/error-message"; -import { AuthService } from "@auth/services"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { ControlErrorPipe, ValidationService } from "projects/core"; import { Router } from "@angular/router"; import { ButtonComponent, InputComponent } from "@ui/components"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * Компонент запроса сброса пароля diff --git a/projects/social_platform/src/app/auth/set-password/set-password.component.html b/projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.html similarity index 100% rename from projects/social_platform/src/app/auth/set-password/set-password.component.html rename to projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.html diff --git a/projects/social_platform/src/app/auth/set-password/set-password.component.scss b/projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.scss similarity index 100% rename from projects/social_platform/src/app/auth/set-password/set-password.component.scss rename to projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.scss diff --git a/projects/social_platform/src/app/auth/set-password/set-password.component.spec.ts b/projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/auth/set-password/set-password.component.spec.ts rename to projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.spec.ts diff --git a/projects/social_platform/src/app/auth/set-password/set-password.component.ts b/projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.ts similarity index 95% rename from projects/social_platform/src/app/auth/set-password/set-password.component.ts rename to projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.ts index 315f86eb..e8ca4a49 100644 --- a/projects/social_platform/src/app/auth/set-password/set-password.component.ts +++ b/projects/social_platform/src/app/ui/pages/auth/set-password/set-password.component.ts @@ -3,10 +3,10 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { ControlErrorPipe, ValidationService } from "projects/core"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { ActivatedRoute, Router } from "@angular/router"; -import { AuthService } from "@auth/services"; import { ButtonComponent, InputComponent } from "@ui/components"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * Компонент установки нового пароля diff --git a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.html b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.html similarity index 100% rename from projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.html rename to projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.html diff --git a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.scss b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.scss similarity index 100% rename from projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.scss rename to projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.scss diff --git a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.spec.ts b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.spec.ts similarity index 93% rename from projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.spec.ts rename to projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.spec.ts index e79b51a5..a9ae8e89 100644 --- a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ChatDirectComponent } from "./chat-direct.component"; +import { ChatDirectComponent } from "./chat-direct/chat-direct.component"; import { RouterTestingModule } from "@angular/router/testing"; import { of } from "rxjs"; import { AuthService } from "@auth/services"; diff --git a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.ts b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.ts similarity index 93% rename from projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.ts rename to projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.ts index c570f608..e0fbf079 100644 --- a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.component.ts +++ b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.component.ts @@ -3,16 +3,16 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute, RouterLink } from "@angular/router"; import { map, noop, Observable, Subscription, tap } from "rxjs"; -import { ChatItem } from "@office/chat/models/chat-item.model"; -import { ChatService } from "@services/chat.service"; -import { ChatMessage } from "@models/chat-message.model"; -import { ChatDirectService } from "@office/chat/services/chat-direct.service"; -import { ChatWindowComponent } from "@office/features/chat-window/chat-window.component"; -import { AuthService } from "@auth/services"; +import { ChatService } from "projects/social_platform/src/app/api/chat/chat.service"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; +import { ChatWindowComponent } from "@ui/components/chat-window/chat-window.component"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { ApiPagination } from "@models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { BarComponent } from "@ui/components"; import { BackComponent } from "@uilib"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { ChatDirectService } from "projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service"; +import { ChatItem } from "projects/social_platform/src/app/domain/chat/chat-item.model"; /** * Компонент для отображения конкретного прямого чата diff --git a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.resolver.spec.ts similarity index 90% rename from projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.resolver.spec.ts index 64847bb0..2cfb1eab 100644 --- a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.resolver.spec.ts +++ b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.resolver.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { ChatDirectResolver } from "./chat-direct.resolver"; +import { ChatDirectResolver } from "./chat-direct/chat-direct.resolver"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router"; diff --git a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.resolver.ts b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.resolver.ts similarity index 83% rename from projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.resolver.ts rename to projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.resolver.ts index 41dc7d28..ce77573b 100644 --- a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct/chat-direct.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/chat/chat-direct/chat-direct.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { ChatDirectService } from "@office/chat/services/chat-direct.service"; -import { ChatItem } from "@office/chat/models/chat-item.model"; +import { ChatDirectService } from "projects/social_platform/src/app/api/chat/chat-direct/chat-direct.service"; +import { ChatItem } from "projects/social_platform/src/app/domain/chat/chat-item.model"; /** * Резолвер для загрузки данных конкретного прямого чата diff --git a/projects/social_platform/src/app/office/chat/chat-groups.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/chat/chat-groups.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/chat/chat-groups.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/chat/chat-groups.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/chat/chat-groups.resolver.ts b/projects/social_platform/src/app/ui/pages/chat/chat-groups.resolver.ts similarity index 81% rename from projects/social_platform/src/app/office/chat/chat-groups.resolver.ts rename to projects/social_platform/src/app/ui/pages/chat/chat-groups.resolver.ts index c039adb1..2c4a9059 100644 --- a/projects/social_platform/src/app/office/chat/chat-groups.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/chat/chat-groups.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ResolveFn } from "@angular/router"; -import { ChatProjectService } from "@office/chat/services/chat-project.service"; -import { ChatListItem } from "@office/chat/models/chat-item.model"; +import { ChatListItem } from "../../../domain/chat/chat-item.model"; +import { ChatProjectService } from "../../../api/chat/chat-projects/chat-project.service"; /** * Резолвер для загрузки групповых чатов (проектных чатов) diff --git a/projects/social_platform/src/app/office/chat/chat.component.html b/projects/social_platform/src/app/ui/pages/chat/chat.component.html similarity index 100% rename from projects/social_platform/src/app/office/chat/chat.component.html rename to projects/social_platform/src/app/ui/pages/chat/chat.component.html diff --git a/projects/social_platform/src/app/office/chat/chat.component.scss b/projects/social_platform/src/app/ui/pages/chat/chat.component.scss similarity index 100% rename from projects/social_platform/src/app/office/chat/chat.component.scss rename to projects/social_platform/src/app/ui/pages/chat/chat.component.scss diff --git a/projects/social_platform/src/app/office/chat/chat.component.spec.ts b/projects/social_platform/src/app/ui/pages/chat/chat.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/chat/chat.component.spec.ts rename to projects/social_platform/src/app/ui/pages/chat/chat.component.spec.ts diff --git a/projects/social_platform/src/app/office/chat/chat.component.ts b/projects/social_platform/src/app/ui/pages/chat/chat.component.ts similarity index 91% rename from projects/social_platform/src/app/office/chat/chat.component.ts rename to projects/social_platform/src/app/ui/pages/chat/chat.component.ts index 3f95c4fe..9a5d6ad6 100644 --- a/projects/social_platform/src/app/office/chat/chat.component.ts +++ b/projects/social_platform/src/app/ui/pages/chat/chat.component.ts @@ -1,17 +1,17 @@ /** @format */ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { NavService } from "@services/nav.service"; +import { NavService } from "@ui/services/nav/nav.service"; import { ActivatedRoute, Router } from "@angular/router"; import { BehaviorSubject, combineLatest, map, Observable, Subscription } from "rxjs"; -import { ChatListItem } from "@office/chat/models/chat-item.model"; -import { AuthService } from "@auth/services"; -import { ChatService } from "@services/chat.service"; -import { ChatCardComponent } from "./shared/chat-card/chat-card.component"; +import { ChatService } from "projects/social_platform/src/app/api/chat/chat.service"; +import { ChatCardComponent } from "../../shared/chat-card/chat-card.component"; import { AsyncPipe } from "@angular/common"; import { BarComponent } from "@ui/components"; import { BarNewComponent } from "@ui/components/bar-new/bar.component"; import { BackComponent } from "@uilib"; +import { AuthService } from "../../../api/auth"; +import { ChatListItem } from "../../../domain/chat/chat-item.model"; /** * Компонент списка чатов - отображает все чаты пользователя diff --git a/projects/social_platform/src/app/office/chat/chat.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/chat/chat.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/chat/chat.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/chat/chat.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/chat/chat.resolver.ts b/projects/social_platform/src/app/ui/pages/chat/chat.resolver.ts similarity index 80% rename from projects/social_platform/src/app/office/chat/chat.resolver.ts rename to projects/social_platform/src/app/ui/pages/chat/chat.resolver.ts index eb20532e..bb91997e 100644 --- a/projects/social_platform/src/app/office/chat/chat.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/chat/chat.resolver.ts @@ -1,9 +1,9 @@ /** @format */ import { inject } from "@angular/core"; -import { ChatDirectService } from "@office/chat/services/chat-direct.service"; -import { ChatListItem } from "@office/chat/models/chat-item.model"; import { ResolveFn } from "@angular/router"; +import { ChatListItem } from "../../../domain/chat/chat-item.model"; +import { ChatDirectService } from "../../../api/chat/chat-direct/chat-direct.service"; /** * Резолвер для загрузки прямых чатов пользователя diff --git a/projects/social_platform/src/app/error/README.md b/projects/social_platform/src/app/ui/pages/error/README.md similarity index 100% rename from projects/social_platform/src/app/error/README.md rename to projects/social_platform/src/app/ui/pages/error/README.md diff --git a/projects/social_platform/src/app/error/code/error-code.component.html b/projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.html similarity index 100% rename from projects/social_platform/src/app/error/code/error-code.component.html rename to projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.html diff --git a/projects/social_platform/src/app/error/code/error-code.component.scss b/projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.scss similarity index 100% rename from projects/social_platform/src/app/error/code/error-code.component.scss rename to projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.scss diff --git a/projects/social_platform/src/app/error/code/error-code.component.spec.ts b/projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.spec.ts similarity index 89% rename from projects/social_platform/src/app/error/code/error-code.component.spec.ts rename to projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.spec.ts index be9ddcd3..cdda750e 100644 --- a/projects/social_platform/src/app/error/code/error-code.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ErrorCodeComponent } from "./error-code.component"; +import { ErrorCodeComponent } from "../../../error/code/error-code.component"; import { RouterTestingModule } from "@angular/router/testing"; describe("ErrorCodeComponent", () => { diff --git a/projects/social_platform/src/app/error/code/error-code.component.ts b/projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.ts similarity index 100% rename from projects/social_platform/src/app/error/code/error-code.component.ts rename to projects/social_platform/src/app/ui/pages/error/error-code/error-code.component.ts diff --git a/projects/social_platform/src/app/error/error.component.html b/projects/social_platform/src/app/ui/pages/error/error.component.html similarity index 100% rename from projects/social_platform/src/app/error/error.component.html rename to projects/social_platform/src/app/ui/pages/error/error.component.html diff --git a/projects/social_platform/src/app/error/error.component.scss b/projects/social_platform/src/app/ui/pages/error/error.component.scss similarity index 100% rename from projects/social_platform/src/app/error/error.component.scss rename to projects/social_platform/src/app/ui/pages/error/error.component.scss diff --git a/projects/social_platform/src/app/error/error.component.spec.ts b/projects/social_platform/src/app/ui/pages/error/error.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/error/error.component.spec.ts rename to projects/social_platform/src/app/ui/pages/error/error.component.spec.ts diff --git a/projects/social_platform/src/app/error/error.component.ts b/projects/social_platform/src/app/ui/pages/error/error.component.ts similarity index 100% rename from projects/social_platform/src/app/error/error.component.ts rename to projects/social_platform/src/app/ui/pages/error/error.component.ts diff --git a/projects/social_platform/src/app/error/not-found/error-not-found.component.html b/projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.html similarity index 100% rename from projects/social_platform/src/app/error/not-found/error-not-found.component.html rename to projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.html diff --git a/projects/social_platform/src/app/error/not-found/error-not-found.component.scss b/projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.scss similarity index 100% rename from projects/social_platform/src/app/error/not-found/error-not-found.component.scss rename to projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.scss diff --git a/projects/social_platform/src/app/error/not-found/error-not-found.component.spec.ts b/projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/error/not-found/error-not-found.component.spec.ts rename to projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.spec.ts diff --git a/projects/social_platform/src/app/error/not-found/error-not-found.component.ts b/projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.ts similarity index 100% rename from projects/social_platform/src/app/error/not-found/error-not-found.component.ts rename to projects/social_platform/src/app/ui/pages/error/not-found/error-not-found.component.ts diff --git a/projects/social_platform/src/app/office/feed/feed.component.html b/projects/social_platform/src/app/ui/pages/feed/feed.component.html similarity index 100% rename from projects/social_platform/src/app/office/feed/feed.component.html rename to projects/social_platform/src/app/ui/pages/feed/feed.component.html diff --git a/projects/social_platform/src/app/office/feed/feed.component.scss b/projects/social_platform/src/app/ui/pages/feed/feed.component.scss similarity index 100% rename from projects/social_platform/src/app/office/feed/feed.component.scss rename to projects/social_platform/src/app/ui/pages/feed/feed.component.scss diff --git a/projects/social_platform/src/app/office/feed/feed.component.ts b/projects/social_platform/src/app/ui/pages/feed/feed.component.ts similarity index 90% rename from projects/social_platform/src/app/office/feed/feed.component.ts rename to projects/social_platform/src/app/ui/pages/feed/feed.component.ts index b0cd630d..cdc967b6 100644 --- a/projects/social_platform/src/app/office/feed/feed.component.ts +++ b/projects/social_platform/src/app/ui/pages/feed/feed.component.ts @@ -12,18 +12,18 @@ import { ViewChild, } from "@angular/core"; import { CommonModule } from "@angular/common"; -import { NewProjectComponent } from "@office/feed/shared/new-project/new-project.component"; import { ActivatedRoute } from "@angular/router"; -import { FeedItem, FeedItemType } from "@office/feed/models/feed-item.model"; import { concatMap, fromEvent, map, noop, of, skip, Subscription, tap, throttleTime } from "rxjs"; -import { ApiPagination } from "@models/api-pagination.model"; -import { FeedService } from "@office/feed/services/feed.service"; -import { ProjectNewsService } from "@office/projects/detail/services/project-news.service"; -import { ProfileNewsService } from "@office/profile/detail/services/profile-news.service"; -import { FeedFilterComponent } from "@office/feed/filter/feed-filter.component"; -import { NewsCardComponent } from "@office/features/news-card/news-card.component"; -import { OpenVacancyComponent } from "./shared/open-vacancy/open-vacancy.component"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { ProfileNewsService } from "projects/social_platform/src/app/api/profile/profile-news.service"; +import { NewsCardComponent } from "@ui/components/news-card/news-card.component"; +import { OpenVacancyComponent } from "../../shared/open-vacancy/open-vacancy.component"; import { IconComponent } from "@ui/components"; +import { NewProjectComponent } from "@ui/shared/new-project/new-project.component"; +import { FeedFilterComponent } from "@ui/components/feed-filter/feed-filter.component"; +import { ProjectNewsService } from "../../../api/project/project-news.service"; +import { FeedService } from "../../../api/feed/feed.service"; +import { FeedItem, FeedItemType } from "../../../domain/feed/feed-item.model"; @Component({ selector: "app-feed", diff --git a/projects/social_platform/src/app/office/feed/feed.resolver.ts b/projects/social_platform/src/app/ui/pages/feed/feed.resolver.ts similarity index 86% rename from projects/social_platform/src/app/office/feed/feed.resolver.ts rename to projects/social_platform/src/app/ui/pages/feed/feed.resolver.ts index 8f452927..cf8d2270 100644 --- a/projects/social_platform/src/app/office/feed/feed.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/feed/feed.resolver.ts @@ -2,9 +2,9 @@ import { inject } from "@angular/core"; import { ResolveFn } from "@angular/router"; -import { FeedItem } from "@office/feed/models/feed-item.model"; -import { FeedService } from "@office/feed/services/feed.service"; -import { ApiPagination } from "@models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { FeedItem } from "../../../domain/feed/feed-item.model"; +import { FeedService } from "../../../api/feed/feed.service"; /** * резолвер ленты новостей diff --git a/projects/social_platform/src/app/office/members/members.component.html b/projects/social_platform/src/app/ui/pages/members/members.component.html similarity index 100% rename from projects/social_platform/src/app/office/members/members.component.html rename to projects/social_platform/src/app/ui/pages/members/members.component.html diff --git a/projects/social_platform/src/app/office/members/members.component.scss b/projects/social_platform/src/app/ui/pages/members/members.component.scss similarity index 100% rename from projects/social_platform/src/app/office/members/members.component.scss rename to projects/social_platform/src/app/ui/pages/members/members.component.scss diff --git a/projects/social_platform/src/app/office/members/members.component.spec.ts b/projects/social_platform/src/app/ui/pages/members/members.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/members/members.component.spec.ts rename to projects/social_platform/src/app/ui/pages/members/members.component.spec.ts diff --git a/projects/social_platform/src/app/office/members/members.component.ts b/projects/social_platform/src/app/ui/pages/members/members.component.ts similarity index 95% rename from projects/social_platform/src/app/office/members/members.component.ts rename to projects/social_platform/src/app/ui/pages/members/members.component.ts index dff7d51e..2c53e5d6 100644 --- a/projects/social_platform/src/app/office/members/members.component.ts +++ b/projects/social_platform/src/app/ui/pages/members/members.component.ts @@ -29,8 +29,8 @@ import { tap, throttleTime, } from "rxjs"; -import { User } from "@auth/models/user.model"; -import { NavService } from "@services/nav.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { NavService } from "@ui/services/nav/nav.service"; import { AbstractControl, FormBuilder, @@ -39,17 +39,16 @@ import { Validators, } from "@angular/forms"; import { containerSm } from "@utils/responsive"; -import { MemberService } from "@services/member.service"; +import { MemberService } from "projects/social_platform/src/app/api/member/member.service"; import { CommonModule } from "@angular/common"; import { SearchComponent } from "@ui/components/search/search.component"; -import { MembersFiltersComponent } from "./filters/members-filters.component"; -import { ApiPagination } from "@models/api-pagination.model"; -import { InfoCardComponent } from "@office/features/info-card/info-card.component"; +import { MembersFiltersComponent } from "../../components/members-filters/members-filters.component"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { InfoCardComponent } from "@ui/components/info-card/info-card.component"; import { BackComponent } from "@uilib"; import { ButtonComponent } from "@ui/components"; -import { ProfileDataService } from "@office/profile/detail/services/profile-date.service"; -import { AuthService } from "@auth/services"; -import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component"; +import { SoonCardComponent } from "@ui/shared/soon-card/soon-card.component"; +import { AuthService } from "../../../api/auth"; /** * Компонент для отображения списка участников с возможностью поиска и фильтрации diff --git a/projects/social_platform/src/app/office/members/members.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/members/members.resolver.spec.ts similarity index 89% rename from projects/social_platform/src/app/office/members/members.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/members/members.resolver.spec.ts index 5e37509f..2a8f31a6 100644 --- a/projects/social_platform/src/app/office/members/members.resolver.spec.ts +++ b/projects/social_platform/src/app/ui/pages/members/members.resolver.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; import { MembersResolver } from "./members.resolver"; -import { MemberService } from "@services/member.service"; +import { MemberService } from "projects/social_platform/src/app/api/member/member.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router"; import { of } from "rxjs"; diff --git a/projects/social_platform/src/app/office/members/members.resolver.ts b/projects/social_platform/src/app/ui/pages/members/members.resolver.ts similarity index 83% rename from projects/social_platform/src/app/office/members/members.resolver.ts rename to projects/social_platform/src/app/ui/pages/members/members.resolver.ts index 02b9c81f..2c1666b5 100644 --- a/projects/social_platform/src/app/office/members/members.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/members/members.resolver.ts @@ -1,10 +1,10 @@ /** @format */ import { inject } from "@angular/core"; -import { MemberService } from "@services/member.service"; +import { MemberService } from "projects/social_platform/src/app/api/member/member.service"; import { ResolveFn } from "@angular/router"; -import { ApiPagination } from "@models/api-pagination.model"; -import { User } from "@auth/models/user.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; /** * Резолвер для предварительной загрузки данных участников перед переходом на страницу diff --git a/projects/social_platform/src/app/office/mentors/mentors.component.html b/projects/social_platform/src/app/ui/pages/mentors/mentors.component.html similarity index 100% rename from projects/social_platform/src/app/office/mentors/mentors.component.html rename to projects/social_platform/src/app/ui/pages/mentors/mentors.component.html diff --git a/projects/social_platform/src/app/office/mentors/mentors.component.scss b/projects/social_platform/src/app/ui/pages/mentors/mentors.component.scss similarity index 100% rename from projects/social_platform/src/app/office/mentors/mentors.component.scss rename to projects/social_platform/src/app/ui/pages/mentors/mentors.component.scss diff --git a/projects/social_platform/src/app/office/mentors/mentors.component.spec.ts b/projects/social_platform/src/app/ui/pages/mentors/mentors.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/mentors/mentors.component.spec.ts rename to projects/social_platform/src/app/ui/pages/mentors/mentors.component.spec.ts diff --git a/projects/social_platform/src/app/office/mentors/mentors.component.ts b/projects/social_platform/src/app/ui/pages/mentors/mentors.component.ts similarity index 91% rename from projects/social_platform/src/app/office/mentors/mentors.component.ts rename to projects/social_platform/src/app/ui/pages/mentors/mentors.component.ts index 1a1345d6..53b5e3a8 100644 --- a/projects/social_platform/src/app/office/mentors/mentors.component.ts +++ b/projects/social_platform/src/app/ui/pages/mentors/mentors.component.ts @@ -12,14 +12,14 @@ import { } from "@angular/core"; import { ActivatedRoute, RouterLink } from "@angular/router"; import { concatMap, fromEvent, map, noop, of, Subscription, tap, throttleTime } from "rxjs"; -import { AuthService } from "@auth/services"; -import { User } from "@auth/models/user.model"; -import { NavService } from "@services/nav.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { NavService } from "@ui/services/nav/nav.service"; import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { containerSm } from "@utils/responsive"; -import { MemberService } from "@services/member.service"; -import { MemberCardComponent } from "../shared/member-card/member-card.component"; -import { ApiPagination } from "@models/api-pagination.model"; +import { MemberService } from "projects/social_platform/src/app/api/member/member.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { ProjectMemberCardComponent } from "@ui/shared/project-member-card/project-member-card.component"; +import { AuthService } from "../../../api/auth"; /** * КОМПОНЕНТ СТРАНИЦЫ МЕНТОРОВ @@ -68,7 +68,7 @@ import { ApiPagination } from "@models/api-pagination.model"; styleUrl: "./mentors.component.scss", changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [RouterLink, MemberCardComponent], + imports: [RouterLink, ProjectMemberCardComponent], }) export class MentorsComponent implements OnInit, OnDestroy, AfterViewInit { constructor( diff --git a/projects/social_platform/src/app/office/mentors/mentors.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/mentors/mentors.resolver.spec.ts similarity index 88% rename from projects/social_platform/src/app/office/mentors/mentors.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/mentors/mentors.resolver.spec.ts index ce614e5c..20870c27 100644 --- a/projects/social_platform/src/app/office/mentors/mentors.resolver.spec.ts +++ b/projects/social_platform/src/app/ui/pages/mentors/mentors.resolver.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from "@angular/core/testing"; import { MentorsResolver } from "./mentors.resolver"; -import { MemberService } from "@services/member.service"; +import { MemberService } from "projects/social_platform/src/app/api/member/member.service"; import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router"; import { of } from "rxjs"; diff --git a/projects/social_platform/src/app/office/mentors/mentors.resolver.ts b/projects/social_platform/src/app/ui/pages/mentors/mentors.resolver.ts similarity index 87% rename from projects/social_platform/src/app/office/mentors/mentors.resolver.ts rename to projects/social_platform/src/app/ui/pages/mentors/mentors.resolver.ts index a6e17aee..a49babbb 100644 --- a/projects/social_platform/src/app/office/mentors/mentors.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/mentors/mentors.resolver.ts @@ -1,10 +1,10 @@ /** @format */ import { inject } from "@angular/core"; -import { MemberService } from "@services/member.service"; +import { MemberService } from "projects/social_platform/src/app/api/member/member.service"; import { ResolveFn } from "@angular/router"; -import { ApiPagination } from "@models/api-pagination.model"; -import { User } from "@auth/models/user.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; /** * РЕЗОЛВЕР СТРАНИЦЫ МЕНТОРОВ diff --git a/projects/social_platform/src/app/office/README.md b/projects/social_platform/src/app/ui/pages/office/README.md similarity index 100% rename from projects/social_platform/src/app/office/README.md rename to projects/social_platform/src/app/ui/pages/office/README.md diff --git a/projects/social_platform/src/app/office/office.component.html b/projects/social_platform/src/app/ui/pages/office/office.component.html similarity index 100% rename from projects/social_platform/src/app/office/office.component.html rename to projects/social_platform/src/app/ui/pages/office/office.component.html diff --git a/projects/social_platform/src/app/office/office.component.scss b/projects/social_platform/src/app/ui/pages/office/office.component.scss similarity index 100% rename from projects/social_platform/src/app/office/office.component.scss rename to projects/social_platform/src/app/ui/pages/office/office.component.scss diff --git a/projects/social_platform/src/app/office/office.component.spec.ts b/projects/social_platform/src/app/ui/pages/office/office.component.spec.ts similarity index 85% rename from projects/social_platform/src/app/office/office.component.spec.ts rename to projects/social_platform/src/app/ui/pages/office/office.component.spec.ts index a22eaffd..c4555cc4 100644 --- a/projects/social_platform/src/app/office/office.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/office/office.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { OfficeComponent } from "./office.component"; -import { IndustryService } from "@services/industry.service"; +import { OfficeComponent } from "../../../office/office.component"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; import { RouterTestingModule } from "@angular/router/testing"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { of } from "rxjs"; diff --git a/projects/social_platform/src/app/office/office.component.ts b/projects/social_platform/src/app/ui/pages/office/office.component.ts similarity index 90% rename from projects/social_platform/src/app/office/office.component.ts rename to projects/social_platform/src/app/ui/pages/office/office.component.ts index 3c82830d..60651022 100644 --- a/projects/social_platform/src/app/office/office.component.ts +++ b/projects/social_platform/src/app/ui/pages/office/office.component.ts @@ -1,23 +1,23 @@ /** @format */ import { Component, OnDestroy, OnInit, Signal } from "@angular/core"; -import { IndustryService } from "@services/industry.service"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; import { forkJoin, map, noop, Subscription } from "rxjs"; import { ActivatedRoute, Router, RouterOutlet } from "@angular/router"; -import { Invite } from "@models/invite.model"; -import { AuthService } from "@auth/services"; -import { ProjectService } from "@services/project.service"; -import { User } from "@auth/models/user.model"; -import { ChatService } from "@services/chat.service"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { ChatService } from "projects/social_platform/src/app/api/chat/chat.service"; import { SnackbarComponent } from "@ui/components/snackbar/snackbar.component"; import { DeleteConfirmComponent } from "@ui/components/delete-confirm/delete-confirm.component"; import { ButtonComponent } from "@ui/components"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { NavComponent } from "./features/nav/nav.component"; +import { NavComponent } from "../../components/nav/nav.component"; import { IconComponent, ProfileControlPanelComponent, SidebarComponent } from "@uilib"; import { AsyncPipe } from "@angular/common"; -import { InviteService } from "@services/invite.service"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; import { toSignal } from "@angular/core/rxjs-interop"; +import { AuthService } from "../../../api/auth"; /** * Главный компонент офиса - корневой компонент рабочего пространства diff --git a/projects/social_platform/src/app/office/office.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/office/office.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/office.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/office/office.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/office.resolver.ts b/projects/social_platform/src/app/ui/pages/office/office.resolver.ts similarity index 79% rename from projects/social_platform/src/app/office/office.resolver.ts rename to projects/social_platform/src/app/ui/pages/office/office.resolver.ts index 2e8cd588..68d57b4a 100644 --- a/projects/social_platform/src/app/office/office.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/office/office.resolver.ts @@ -1,8 +1,8 @@ /** @format */ import { inject } from "@angular/core"; -import { InviteService } from "@services/invite.service"; -import { Invite } from "@models/invite.model"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; import { ResolveFn } from "@angular/router"; /** diff --git a/projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.html b/projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.html similarity index 100% rename from projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.html rename to projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.html diff --git a/projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.scss b/projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.scss similarity index 100% rename from projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.scss rename to projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.scss diff --git a/projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.spec.ts b/projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.spec.ts similarity index 92% rename from projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.spec.ts rename to projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.spec.ts index 53707350..fc2c6c40 100644 --- a/projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { OnboardingComponent } from "./onboarding.component"; +import { OnboardingComponent } from "./onboarding/onboarding.component"; import { RouterTestingModule } from "@angular/router/testing"; import { of } from "rxjs"; import { AuthService } from "@auth/services"; diff --git a/projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.ts b/projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.ts similarity index 98% rename from projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.ts rename to projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.ts index 4166fe1c..2f7ad707 100644 --- a/projects/social_platform/src/app/office/onboarding/onboarding/onboarding.component.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/onboarding.component.ts @@ -3,7 +3,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute, Router, RouterOutlet } from "@angular/router"; import { Subscription } from "rxjs"; -import { OnboardingService } from "../services/onboarding.service"; +import { OnboardingService } from "../../../api/onboarding/onboarding.service"; /** * ОСНОВНОЙ КОМПОНЕНТ ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.html b/projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.html similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.html rename to projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.html diff --git a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.scss b/projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.scss similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.scss rename to projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.scss diff --git a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.spec.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.spec.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.spec.ts diff --git a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.ts similarity index 91% rename from projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.ts index 81728037..b2c8afd4 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.component.ts @@ -3,19 +3,19 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit, signal } from "@angular/core"; import { NonNullableFormBuilder, ReactiveFormsModule } from "@angular/forms"; import { concatMap, map, Observable, Subscription, take } from "rxjs"; -import { AuthService } from "@auth/services"; import { ControlErrorPipe, ValidationService } from "@corelib"; import { ActivatedRoute, Router } from "@angular/router"; -import { OnboardingService } from "../services/onboarding.service"; +import { OnboardingService } from "../../../../api/onboarding/onboarding.service"; import { ButtonComponent, IconComponent } from "@ui/components"; import { CommonModule } from "@angular/common"; import { AutoCompleteInputComponent } from "@ui/components/autocomplete-input/autocomplete-input.component"; -import { SpecializationsGroup } from "@office/models/specializations-group"; -import { SpecializationsGroupComponent } from "@office/shared/specializations-group/specializations-group.component"; -import { Specialization } from "@office/models/specialization"; -import { SpecializationsService } from "@office/services/specializations.service"; -import { ErrorMessage } from "@error/models/error-message"; +import { SpecializationsGroup } from "projects/social_platform/src/app/domain/specializations/specializations-group"; +import { SpecializationsGroupComponent } from "@ui/shared/specializations-group/specializations-group.component"; +import { Specialization } from "projects/social_platform/src/app/domain/specializations/specialization"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { TooltipComponent } from "@ui/components/tooltip/tooltip.component"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { SpecializationsService } from "projects/social_platform/src/app/api/specializations/specializations.service"; /** * КОМПОНЕНТ ПЕРВОГО ЭТАПА ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.resolver.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.resolver.ts similarity index 87% rename from projects/social_platform/src/app/office/onboarding/stage-one/stage-one.resolver.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.resolver.ts index 4e8f05f6..752b820d 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-one/stage-one.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/stage-one/stage-one.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ResolveFn } from "@angular/router"; -import { SpecializationsService } from "@office/services/specializations.service"; -import { SpecializationsGroup } from "@office/models/specializations-group"; +import { SpecializationsService } from "projects/social_platform/src/app/api/specializations/specializations.service"; +import { SpecializationsGroup } from "projects/social_platform/src/app/domain/specializations/specializations-group"; /** * РЕЗОЛВЕР ПЕРВОГО ЭТАПА ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.html b/projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.html similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.html rename to projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.html diff --git a/projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.scss b/projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.scss similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.scss rename to projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.scss diff --git a/projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.spec.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.spec.ts similarity index 93% rename from projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.spec.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.spec.ts index 95e2be61..4a037a1f 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.spec.ts @@ -5,7 +5,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { OnboardingStageThreeComponent } from "./stage-three.component"; import { of } from "rxjs"; import { AuthService } from "@auth/services"; -import { OnboardingService } from "../services/onboarding.service"; +import { OnboardingService } from "../../../../api/onboarding/onboarding.service"; import { RouterTestingModule } from "@angular/router/testing"; describe("StageThreeComponent", () => { diff --git a/projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.ts similarity index 92% rename from projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.ts index 1d8421f0..6e6f4c3d 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-three/stage-three.component.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/stage-three/stage-three.component.ts @@ -1,12 +1,12 @@ /** @format */ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { AuthService } from "@auth/services"; import { concatMap, Subscription, take } from "rxjs"; import { Router } from "@angular/router"; -import { OnboardingService } from "@office/onboarding/services/onboarding.service"; import { ButtonComponent } from "@ui/components"; -import { UserTypeCardComponent } from "@office/onboarding/user-type-card/user-type-card.component"; +import { UserTypeCardComponent } from "@ui/shared/user-type-card/user-type-card.component"; +import { OnboardingService } from "projects/social_platform/src/app/api/onboarding/onboarding.service"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * КОМПОНЕНТ ТРЕТЬЕГО ЭТАПА ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.html b/projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.html similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.html rename to projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.html diff --git a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.scss b/projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.scss similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.scss rename to projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.scss diff --git a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.spec.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.spec.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.spec.ts diff --git a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.ts similarity index 93% rename from projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.ts index 193e4b4a..daa46a4b 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.component.ts @@ -3,20 +3,20 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit, signal } from "@angular/core"; import { NonNullableFormBuilder, ReactiveFormsModule } from "@angular/forms"; import { concatMap, map, Observable, Subscription, take } from "rxjs"; -import { AuthService } from "@auth/services"; import { ControlErrorPipe, ValidationService } from "@corelib"; import { ActivatedRoute, Router } from "@angular/router"; -import { OnboardingService } from "../services/onboarding.service"; +import { OnboardingService } from "../../../../api/onboarding/onboarding.service"; import { ButtonComponent, IconComponent } from "@ui/components"; import { CommonModule } from "@angular/common"; import { AutoCompleteInputComponent } from "@ui/components/autocomplete-input/autocomplete-input.component"; -import { Skill } from "@office/models/skill"; -import { SkillsService } from "@office/services/skills.service"; -import { SkillsGroup } from "@office/models/skills-group"; -import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.component"; -import { SkillsBasketComponent } from "@office/shared/skills-basket/skills-basket.component"; +import { SkillsGroupComponent } from "@ui/shared/skills-group/skills-group.component"; +import { SkillsBasketComponent } from "@ui/shared/skills-basket/skills-basket.component"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { TooltipComponent } from "@ui/components/tooltip/tooltip.component"; +import { SkillsService } from "projects/social_platform/src/app/api/skills/skills.service"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { SkillsGroup } from "projects/social_platform/src/app/domain/skills/skills-group"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; /** * КОМПОНЕНТ ВТОРОГО ЭТАПА ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.resolver.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.resolver.ts similarity index 91% rename from projects/social_platform/src/app/office/onboarding/stage-two/stage-two.resolver.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.resolver.ts index 38d91200..83790bd2 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-two/stage-two.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/stage-two/stage-two.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ResolveFn } from "@angular/router"; -import { SkillsService } from "@office/services/skills.service"; -import { SkillsGroup } from "@office/models/skills-group"; +import { SkillsService } from "projects/social_platform/src/app/api/skills/skills.service"; +import { SkillsGroup } from "projects/social_platform/src/app/domain/skills/skills-group"; /** * РЕЗОЛВЕР ВТОРОГО ЭТАПА ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.html b/projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.html similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.html rename to projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.html diff --git a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.scss b/projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.scss similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.scss rename to projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.scss diff --git a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.spec.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.spec.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.spec.ts diff --git a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts b/projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.ts similarity index 98% rename from projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts rename to projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.ts index 8c8dc8ed..b8ec8d68 100644 --- a/projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts +++ b/projects/social_platform/src/app/ui/pages/onboarding/stage-zero/stage-zero.component.ts @@ -1,14 +1,13 @@ /** @format */ import { ChangeDetectorRef, Component, OnDestroy, OnInit, signal } from "@angular/core"; -import { AuthService } from "@auth/services"; import { FormArray, FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { ErrorMessage } from "@error/models/error-message"; -import { ControlErrorPipe, ValidationService, YearsFromBirthdayPipe } from "projects/core"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ControlErrorPipe, ValidationService } from "projects/core"; import { concatMap, Subscription } from "rxjs"; import { Router } from "@angular/router"; -import { User } from "@auth/models/user.model"; -import { OnboardingService } from "../services/onboarding.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { OnboardingService } from "../../../../api/onboarding/onboarding.service"; import { ButtonComponent, InputComponent, SelectComponent } from "@ui/components"; import { AvatarControlComponent } from "@ui/components/avatar-control/avatar-control.component"; import { CommonModule } from "@angular/common"; @@ -26,6 +25,7 @@ import { yearRangeValidators } from "@utils/helpers/yearRangeValidators"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { TooltipComponent } from "@ui/components/tooltip/tooltip.component"; import { generateOptionsList } from "@utils/generate-options-list"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * КОМПОНЕНТ НУЛЕВОГО ЭТАПА ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/profile/detail/main/main.component.html b/projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.html similarity index 100% rename from projects/social_platform/src/app/office/profile/detail/main/main.component.html rename to projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.html diff --git a/projects/social_platform/src/app/office/profile/detail/main/main.component.scss b/projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.scss similarity index 100% rename from projects/social_platform/src/app/office/profile/detail/main/main.component.scss rename to projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.scss diff --git a/projects/social_platform/src/app/office/profile/detail/main/main.component.spec.ts b/projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/profile/detail/main/main.component.spec.ts rename to projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.spec.ts diff --git a/projects/social_platform/src/app/office/profile/detail/main/main.component.ts b/projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.ts similarity index 87% rename from projects/social_platform/src/app/office/profile/detail/main/main.component.ts rename to projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.ts index 46262637..6cf6bc4a 100644 --- a/projects/social_platform/src/app/office/profile/detail/main/main.component.ts +++ b/projects/social_platform/src/app/ui/pages/profile/detail/main/main.component.ts @@ -13,34 +13,23 @@ import { ViewChild, } from "@angular/core"; import { ActivatedRoute, RouterLink } from "@angular/router"; -import { User } from "@auth/models/user.model"; -import { AuthService } from "@auth/services"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { expandElement } from "@utils/expand-element"; -import { concatMap, filter, map, noop, Observable, of, Subscription, switchMap } from "rxjs"; -import { ProfileNewsService } from "../services/profile-news.service"; -import { ProfileNews } from "../models/profile-news.model"; -import { - ParseBreaksPipe, - ParseLinksPipe, - PluralizePipe, - YearsFromBirthdayPipe, -} from "projects/core"; -import { UserLinksPipe } from "@core/pipes/user-links.pipe"; +import { concatMap, filter, map, noop, Subscription } from "rxjs"; +import { ProfileNewsService } from "../../../../../api/profile/profile-news.service"; +import { ProfileNews } from "../../../../../domain/profile/profile-news.model"; +import { ParseBreaksPipe, ParseLinksPipe, YearsFromBirthdayPipe } from "projects/core"; import { IconComponent, ButtonComponent } from "@ui/components"; -import { TagComponent } from "@ui/components/tag/tag.component"; -import { AsyncPipe, CommonModule, NgTemplateOutlet } from "@angular/common"; -import { ProfileService } from "@auth/services/profile.service"; +import { CommonModule, NgTemplateOutlet } from "@angular/common"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { AvatarComponent } from "../../../../ui/components/avatar/avatar.component"; -import { Skill } from "@office/models/skill"; -import { HttpErrorResponse } from "@angular/common/http"; -import { NewsFormComponent } from "@office/features/news-form/news-form.component"; -import { NewsCardComponent } from "@office/features/news-card/news-card.component"; -import { ProfileDataService } from "../services/profile-date.service"; -import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component"; -import { ProjectDirectionCard } from "@office/projects/detail/shared/project-direction-card/project-direction-card.component"; +import { NewsFormComponent } from "@ui/components/news-form/news-form.component"; +import { NewsCardComponent } from "@ui/components/news-card/news-card.component"; +import { ProfileDataService } from "../../../../../api/profile/profile-date.service"; import { DirectionItem, directionItemBuilder } from "@utils/helpers/directionItemBuilder"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { UserLinksPipe } from "projects/core/src/lib/pipes/user/user-links.pipe"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { ProjectDirectionCard } from "@ui/shared/project-direction-card/project-direction-card.component"; /** * Главный компонент страницы профиля пользователя diff --git a/projects/social_platform/src/app/office/profile/detail/main/main.resolver.ts b/projects/social_platform/src/app/ui/pages/profile/detail/main/main.resolver.ts similarity index 94% rename from projects/social_platform/src/app/office/profile/detail/main/main.resolver.ts rename to projects/social_platform/src/app/ui/pages/profile/detail/main/main.resolver.ts index 89a00aab..c5db6e36 100644 --- a/projects/social_platform/src/app/office/profile/detail/main/main.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/profile/detail/main/main.resolver.ts @@ -1,7 +1,7 @@ /** @format */ import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { ProfileNewsService } from "../services/profile-news.service"; +import { ProfileNewsService } from "../../../../../api/profile/profile-news.service"; import { inject } from "@angular/core"; /** diff --git a/projects/social_platform/src/app/office/profile/detail/profile-detail.resolver.ts b/projects/social_platform/src/app/ui/pages/profile/detail/profile-detail.resolver.ts similarity index 82% rename from projects/social_platform/src/app/office/profile/detail/profile-detail.resolver.ts rename to projects/social_platform/src/app/ui/pages/profile/detail/profile-detail.resolver.ts index f28d76dd..7718e16b 100644 --- a/projects/social_platform/src/app/office/profile/detail/profile-detail.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/profile/detail/profile-detail.resolver.ts @@ -2,13 +2,12 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { AuthService } from "@auth/services"; -import { User } from "@auth/models/user.model"; -import { SubscriptionService } from "@office/services/subscription.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { SubscriptionService } from "projects/social_platform/src/app/api/subsriptions/subscription.service"; import { forkJoin, map, mergeMap, tap } from "rxjs"; -import { Project } from "@office/models/project.model"; -import { ProfileDataService } from "./services/profile-date.service"; -import { profile } from "console"; +import { ProfileDataService } from "../../../../api/profile/profile-date.service"; +import { AuthService } from "../../../../api/auth"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; /** * Резолвер для загрузки данных профиля пользователя diff --git a/projects/social_platform/src/app/office/profile/detail/projects/projects.component.html b/projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.html similarity index 100% rename from projects/social_platform/src/app/office/profile/detail/projects/projects.component.html rename to projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.html diff --git a/projects/social_platform/src/app/office/profile/detail/projects/projects.component.scss b/projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.scss similarity index 100% rename from projects/social_platform/src/app/office/profile/detail/projects/projects.component.scss rename to projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.scss diff --git a/projects/social_platform/src/app/office/profile/detail/projects/projects.component.spec.ts b/projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/profile/detail/projects/projects.component.spec.ts rename to projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.spec.ts diff --git a/projects/social_platform/src/app/office/profile/detail/projects/projects.component.ts b/projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.ts similarity index 87% rename from projects/social_platform/src/app/office/profile/detail/projects/projects.component.ts rename to projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.ts index f1e87421..5eb97f38 100644 --- a/projects/social_platform/src/app/office/profile/detail/projects/projects.component.ts +++ b/projects/social_platform/src/app/ui/pages/profile/detail/projects/projects.component.ts @@ -2,13 +2,13 @@ import { Component, inject, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute, RouterLink } from "@angular/router"; -import { User } from "@auth/models/user.model"; -import { AuthService } from "@auth/services"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { filter, Subscription, take } from "rxjs"; import { AsyncPipe } from "@angular/common"; -import { Project } from "@office/models/project.model"; -import { InfoCardComponent } from "@office/features/info-card/info-card.component"; -import { ProfileDataService } from "../services/profile-date.service"; +import { InfoCardComponent } from "@ui/components/info-card/info-card.component"; +import { ProfileDataService } from "../../../../../api/profile/profile-date.service"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; /** * Компонент для отображения проектов пользователя diff --git a/projects/social_platform/src/app/office/profile/edit/edit.component.html b/projects/social_platform/src/app/ui/pages/profile/edit/edit.component.html similarity index 100% rename from projects/social_platform/src/app/office/profile/edit/edit.component.html rename to projects/social_platform/src/app/ui/pages/profile/edit/edit.component.html diff --git a/projects/social_platform/src/app/office/profile/edit/edit.component.scss b/projects/social_platform/src/app/ui/pages/profile/edit/edit.component.scss similarity index 100% rename from projects/social_platform/src/app/office/profile/edit/edit.component.scss rename to projects/social_platform/src/app/ui/pages/profile/edit/edit.component.scss diff --git a/projects/social_platform/src/app/office/profile/edit/edit.component.spec.ts b/projects/social_platform/src/app/ui/pages/profile/edit/edit.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/profile/edit/edit.component.spec.ts rename to projects/social_platform/src/app/ui/pages/profile/edit/edit.component.spec.ts diff --git a/projects/social_platform/src/app/office/profile/edit/edit.component.ts b/projects/social_platform/src/app/ui/pages/profile/edit/edit.component.ts similarity index 97% rename from projects/social_platform/src/app/office/profile/edit/edit.component.ts rename to projects/social_platform/src/app/ui/pages/profile/edit/edit.component.ts index d39f1cd7..6468fd98 100644 --- a/projects/social_platform/src/app/office/profile/edit/edit.component.ts +++ b/projects/social_platform/src/app/ui/pages/profile/edit/edit.component.ts @@ -8,7 +8,6 @@ import { OnInit, signal, } from "@angular/core"; -import { AuthService } from "@auth/services"; import { FormArray, FormBuilder, @@ -17,27 +16,24 @@ import { ReactiveFormsModule, Validators, } from "@angular/forms"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { ButtonComponent, IconComponent, InputComponent, SelectComponent } from "@ui/components"; import { ControlErrorPipe, ValidationService } from "projects/core"; import { concatMap, first, map, noop, Observable, skip, Subscription } from "rxjs"; import { ActivatedRoute, Router, RouterModule } from "@angular/router"; import * as dayjs from "dayjs"; import * as cpf from "dayjs/plugin/customParseFormat"; -import { NavService } from "@services/nav.service"; +import { NavService } from "@ui/services/nav/nav.service"; import { EditorSubmitButtonDirective } from "@ui/directives/editor-submit-button.directive"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; import { AvatarControlComponent } from "@ui/components/avatar-control/avatar-control.component"; import { AsyncPipe, CommonModule } from "@angular/common"; -import { Specialization } from "@office/models/specialization"; -import { SpecializationsService } from "@office/services/specializations.service"; +import { Specialization } from "projects/social_platform/src/app/domain/specializations/specialization"; import { AutoCompleteInputComponent } from "@ui/components/autocomplete-input/autocomplete-input.component"; -import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.component"; -import { SpecializationsGroupComponent } from "@office/shared/specializations-group/specializations-group.component"; -import { SkillsBasketComponent } from "@office/shared/skills-basket/skills-basket.component"; +import { SkillsGroupComponent } from "@ui/shared/skills-group/skills-group.component"; +import { SpecializationsGroupComponent } from "@ui/shared/specializations-group/specializations-group.component"; +import { SkillsBasketComponent } from "@ui/shared/skills-basket/skills-basket.component"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { Skill } from "@office/models/skill"; -import { SkillsService } from "@office/services/skills.service"; import { educationUserLevel, educationUserType, @@ -48,11 +44,15 @@ import { } from "projects/core/src/consts/lists/language-info-list.const"; import { transformYearStringToNumber } from "@utils/helpers/transformYear"; import { yearRangeValidators } from "@utils/helpers/yearRangeValidators"; -import { Achievement, User } from "@auth/models/user.model"; +import { Achievement, User } from "projects/social_platform/src/app/domain/auth/user.model"; import { generateOptionsList } from "@utils/generate-options-list"; import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; import { navProfileItems } from "projects/core/src/consts/navigation/nav-profile-items.const"; import { FileItemComponent } from "@ui/components/file-item/file-item.component"; +import { AuthService } from "../../../../api/auth"; +import { SpecializationsService } from "projects/social_platform/src/app/api/specializations/specializations.service"; +import { SkillsService } from "projects/social_platform/src/app/api/skills/skills.service"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; dayjs.extend(cpf); diff --git a/projects/social_platform/src/app/office/program/detail/detail.resolver.ts b/projects/social_platform/src/app/ui/pages/program/detail/detail.resolver.ts similarity index 87% rename from projects/social_platform/src/app/office/program/detail/detail.resolver.ts rename to projects/social_platform/src/app/ui/pages/program/detail/detail.resolver.ts index f0de67f2..a7448535 100644 --- a/projects/social_platform/src/app/office/program/detail/detail.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/detail.resolver.ts @@ -2,10 +2,10 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { ProgramService } from "@office/program/services/program.service"; -import { Program } from "@office/program/models/program.model"; +import { ProgramDataService } from "projects/social_platform/src/app/api/program/program-data.service"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; +import { Program } from "projects/social_platform/src/app/domain/program/program.model"; import { tap } from "rxjs"; -import { ProgramDataService } from "../services/program-data.service"; /** * Резолвер для получения детальной информации о программе diff --git a/projects/social_platform/src/app/office/program/detail/list/list-all.resolver.ts b/projects/social_platform/src/app/ui/pages/program/detail/list/list-all.resolver.ts similarity index 72% rename from projects/social_platform/src/app/office/program/detail/list/list-all.resolver.ts rename to projects/social_platform/src/app/ui/pages/program/detail/list/list-all.resolver.ts index 5a7b3043..09981720 100644 --- a/projects/social_platform/src/app/office/program/detail/list/list-all.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/list/list-all.resolver.ts @@ -1,10 +1,11 @@ /** @format */ +import { HttpParams } from "@angular/common/http"; import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn, Router } from "@angular/router"; -import { ApiPagination } from "@office/models/api-pagination.model"; -import { ProjectRate } from "@office/program/models/project-rate"; -import { ProjectRatingService } from "@office/program/services/project-rating.service"; +import { ProjectRatingService } from "projects/social_platform/src/app/api/project/project-rating.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { ProjectRate } from "projects/social_platform/src/app/domain/project/project-rate"; import { catchError, EMPTY } from "rxjs"; /** @@ -48,17 +49,22 @@ export const ListAllResolver: ResolveFn> = ( const projectRatingService = inject(ProjectRatingService); const router = inject(Router); - return projectRatingService.getAll(route.parent?.params["programId"], 0, 8).pipe( - catchError(error => { - if (error.status === 403) { - router.navigate([], { - queryParams: { access: "accessDenied" }, - queryParamsHandling: "merge", - replaceUrl: true, - }); - } + return projectRatingService + .getAll( + route.parent?.params["programId"], + new HttpParams({ fromObject: { offset: 0, limit: 8 } }) + ) + .pipe( + catchError(error => { + if (error.status === 403) { + router.navigate([], { + queryParams: { access: "accessDenied" }, + queryParamsHandling: "merge", + replaceUrl: true, + }); + } - return EMPTY; - }) - ); + return EMPTY; + }) + ); }; diff --git a/projects/social_platform/src/app/office/program/detail/list/list.component.html b/projects/social_platform/src/app/ui/pages/program/detail/list/list.component.html similarity index 95% rename from projects/social_platform/src/app/office/program/detail/list/list.component.html rename to projects/social_platform/src/app/ui/pages/program/detail/list/list.component.html index 31d170ce..5cb97048 100644 --- a/projects/social_platform/src/app/office/program/detail/list/list.component.html +++ b/projects/social_platform/src/app/ui/pages/program/detail/list/list.component.html @@ -50,11 +50,11 @@ (touchmove)="onSwipeMove($event)" (touchend)="onSwipeEnd($event)" >
    - + >
    } diff --git a/projects/social_platform/src/app/office/program/detail/list/list.component.scss b/projects/social_platform/src/app/ui/pages/program/detail/list/list.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/detail/list/list.component.scss rename to projects/social_platform/src/app/ui/pages/program/detail/list/list.component.scss diff --git a/projects/social_platform/src/app/office/program/detail/list/list.component.spec.ts b/projects/social_platform/src/app/ui/pages/program/detail/list/list.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/detail/list/list.component.spec.ts rename to projects/social_platform/src/app/ui/pages/program/detail/list/list.component.spec.ts diff --git a/projects/social_platform/src/app/office/program/detail/list/list.component.ts b/projects/social_platform/src/app/ui/pages/program/detail/list/list.component.ts similarity index 93% rename from projects/social_platform/src/app/office/program/detail/list/list.component.ts rename to projects/social_platform/src/app/ui/pages/program/detail/list/list.component.ts index 986dbb9e..e26c070f 100644 --- a/projects/social_platform/src/app/office/program/detail/list/list.component.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/list/list.component.ts @@ -27,24 +27,23 @@ import { tap, throttleTime, } from "rxjs"; -import { ProjectsFilterComponent } from "@office/program/detail/list/projects-filter/projects-filter.component"; import Fuse from "fuse.js"; import { ActivatedRoute, Router, RouterModule } from "@angular/router"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { SearchComponent } from "@ui/components/search/search.component"; -import { User } from "@auth/models/user.model"; -import { Project } from "@office/models/project.model"; -import { RatingCardComponent } from "@office/program/shared/rating-card/rating-card.component"; -import { ProgramService } from "@office/program/services/program.service"; -import { ProjectRatingService } from "@office/program/services/project-rating.service"; -import { AuthService } from "@auth/services"; -import { SubscriptionService } from "@office/services/subscription.service"; -import { ApiPagination } from "@models/api-pagination.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { SubscriptionService } from "projects/social_platform/src/app/api/subsriptions/subscription.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; -import { PartnerProgramFields } from "@office/models/partner-program-fields.model"; -import { CheckboxComponent } from "@ui/components"; -import { InfoCardComponent } from "@office/features/info-card/info-card.component"; +import { PartnerProgramFields } from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { InfoCardComponent } from "@ui/components/info-card/info-card.component"; import { tagsFilter } from "projects/core/src/consts/filters/tags-filter.const"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { ProgramProjectsFilterComponent } from "@ui/components/program-projects-filter/program-projects-filter.component"; +import { RatingCardComponent } from "@ui/shared/rating-card/rating-card.component"; +import { ProjectRatingService } from "projects/social_platform/src/app/api/project/project-rating.service"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; @Component({ selector: "app-list", @@ -54,7 +53,7 @@ import { tagsFilter } from "projects/core/src/consts/filters/tags-filter.const"; CommonModule, ReactiveFormsModule, RouterModule, - ProjectsFilterComponent, + ProgramProjectsFilterComponent, SearchComponent, RatingCardComponent, InfoCardComponent, diff --git a/projects/social_platform/src/app/office/program/detail/list/members.resolver.ts b/projects/social_platform/src/app/ui/pages/program/detail/list/members.resolver.ts similarity index 87% rename from projects/social_platform/src/app/office/program/detail/list/members.resolver.ts rename to projects/social_platform/src/app/ui/pages/program/detail/list/members.resolver.ts index 4314a4d8..d974bae6 100644 --- a/projects/social_platform/src/app/office/program/detail/list/members.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/list/members.resolver.ts @@ -2,9 +2,9 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { ProgramService } from "@office/program/services/program.service"; -import { ApiPagination } from "@models/api-pagination.model"; -import { User } from "@auth/models/user.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; /** * Резолвер для предзагрузки участников программы diff --git a/projects/social_platform/src/app/office/program/detail/list/projects.resolver.ts b/projects/social_platform/src/app/ui/pages/program/detail/list/projects.resolver.ts similarity index 87% rename from projects/social_platform/src/app/office/program/detail/list/projects.resolver.ts rename to projects/social_platform/src/app/ui/pages/program/detail/list/projects.resolver.ts index ec081377..ea96f6c4 100644 --- a/projects/social_platform/src/app/office/program/detail/list/projects.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/list/projects.resolver.ts @@ -2,11 +2,11 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn, Router } from "@angular/router"; -import { ProgramService } from "@office/program/services/program.service"; -import { Project } from "@models/project.model"; -import { ApiPagination } from "@models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; import { catchError, EMPTY } from "rxjs"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; /** * Резолвер для предзагрузки проектов программы diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.html b/projects/social_platform/src/app/ui/pages/program/detail/main/main.component.html similarity index 100% rename from projects/social_platform/src/app/office/program/detail/main/main.component.html rename to projects/social_platform/src/app/ui/pages/program/detail/main/main.component.html diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.scss b/projects/social_platform/src/app/ui/pages/program/detail/main/main.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/detail/main/main.component.scss rename to projects/social_platform/src/app/ui/pages/program/detail/main/main.component.scss diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.spec.ts b/projects/social_platform/src/app/ui/pages/program/detail/main/main.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/detail/main/main.component.spec.ts rename to projects/social_platform/src/app/ui/pages/program/detail/main/main.component.spec.ts diff --git a/projects/social_platform/src/app/office/program/detail/main/main.component.ts b/projects/social_platform/src/app/ui/pages/program/detail/main/main.component.ts similarity index 89% rename from projects/social_platform/src/app/office/program/detail/main/main.component.ts rename to projects/social_platform/src/app/ui/pages/program/detail/main/main.component.ts index ca2e1457..d8197a29 100644 --- a/projects/social_platform/src/app/office/program/detail/main/main.component.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/main/main.component.ts @@ -8,7 +8,6 @@ import { signal, ViewChild, } from "@angular/core"; -import { ProgramService } from "@office/program/services/program.service"; import { ActivatedRoute, Router, RouterModule } from "@angular/router"; import { concatMap, @@ -21,26 +20,26 @@ import { tap, throttleTime, } from "rxjs"; -import { Program } from "@office/program/models/program.model"; -import { ProgramNewsService } from "@office/program/services/program-news.service"; -import { FeedNews } from "@office/projects/models/project-news.model"; import { expandElement } from "@utils/expand-element"; import { ParseBreaksPipe, ParseLinksPipe } from "projects/core"; -import { UserLinksPipe } from "@core/pipes/user-links.pipe"; import { ButtonComponent, IconComponent } from "@ui/components"; -import { ApiPagination } from "@models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { TagComponent } from "@ui/components/tag/tag.component"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { MatProgressBarModule } from "@angular/material/progress-bar"; -import { LoadingService } from "@office/services/loading.service"; -import { ProjectAdditionalService } from "@office/projects/edit/services/project-additional.service"; -import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component"; -import { NewsFormComponent } from "@office/features/news-form/news-form.component"; -import { AsyncPipe } from "@angular/common"; +import { LoadingService } from "@ui/services/loading/loading.service"; +import { SoonCardComponent } from "@ui/shared/soon-card/soon-card.component"; +import { NewsFormComponent } from "@ui/components/news-form/news-form.component"; import { AvatarComponent } from "@uilib"; -import { NewsCardComponent } from "@office/features/news-card/news-card.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { NewsCardComponent } from "@ui/components/news-card/news-card.component"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { UserLinksPipe } from "projects/core/src/lib/pipes/user/user-links.pipe"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; +import { ProgramNewsService } from "projects/social_platform/src/app/api/program/program-news.service"; +import { ProjectAdditionalService } from "projects/social_platform/src/app/api/project/project-additional.service"; +import { FeedNews } from "projects/social_platform/src/app/domain/project/project-news.model"; +import { Program } from "projects/social_platform/src/app/domain/program/program.model"; @Component({ selector: "app-main", @@ -51,7 +50,6 @@ import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; IconComponent, ButtonComponent, UserLinksPipe, - AsyncPipe, ParseBreaksPipe, ParseLinksPipe, ModalComponent, diff --git a/projects/social_platform/src/app/office/program/detail/register/register.component.html b/projects/social_platform/src/app/ui/pages/program/detail/register/register.component.html similarity index 100% rename from projects/social_platform/src/app/office/program/detail/register/register.component.html rename to projects/social_platform/src/app/ui/pages/program/detail/register/register.component.html diff --git a/projects/social_platform/src/app/office/program/detail/register/register.component.scss b/projects/social_platform/src/app/ui/pages/program/detail/register/register.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/detail/register/register.component.scss rename to projects/social_platform/src/app/ui/pages/program/detail/register/register.component.scss diff --git a/projects/social_platform/src/app/office/program/detail/register/register.component.spec.ts b/projects/social_platform/src/app/ui/pages/program/detail/register/register.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/detail/register/register.component.spec.ts rename to projects/social_platform/src/app/ui/pages/program/detail/register/register.component.spec.ts diff --git a/projects/social_platform/src/app/office/program/detail/register/register.component.ts b/projects/social_platform/src/app/ui/pages/program/detail/register/register.component.ts similarity index 95% rename from projects/social_platform/src/app/office/program/detail/register/register.component.ts rename to projects/social_platform/src/app/ui/pages/program/detail/register/register.component.ts index cbf3bd75..1562ee7e 100644 --- a/projects/social_platform/src/app/office/program/detail/register/register.component.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/register/register.component.ts @@ -4,11 +4,11 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { map, Subscription } from "rxjs"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { ProgramDataSchema } from "@office/program/models/program.model"; import { ControlErrorPipe, ValidationService } from "projects/core"; -import { ProgramService } from "@office/program/services/program.service"; import { BarComponent, ButtonComponent, InputComponent } from "@ui/components"; import { KeyValuePipe } from "@angular/common"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; +import { ProgramDataSchema } from "projects/social_platform/src/app/domain/program/program.model"; /** * Компонент регистрации в программе diff --git a/projects/social_platform/src/app/office/program/detail/register/register.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/program/detail/register/register.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/detail/register/register.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/program/detail/register/register.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/program/detail/register/register.resolver.ts b/projects/social_platform/src/app/ui/pages/program/detail/register/register.resolver.ts similarity index 90% rename from projects/social_platform/src/app/office/program/detail/register/register.resolver.ts rename to projects/social_platform/src/app/ui/pages/program/detail/register/register.resolver.ts index 4eebb752..340d05f2 100644 --- a/projects/social_platform/src/app/office/program/detail/register/register.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/register/register.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { ProgramService } from "@office/program/services/program.service"; -import { ProgramDataSchema } from "@office/program/models/program.model"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; +import { ProgramDataSchema } from "projects/social_platform/src/app/domain/program/program.model"; /** * Резолвер для получения схемы данных регистрации в программе diff --git a/projects/social_platform/src/app/office/program/main/main.component.html b/projects/social_platform/src/app/ui/pages/program/main/main.component.html similarity index 100% rename from projects/social_platform/src/app/office/program/main/main.component.html rename to projects/social_platform/src/app/ui/pages/program/main/main.component.html diff --git a/projects/social_platform/src/app/office/program/main/main.component.scss b/projects/social_platform/src/app/ui/pages/program/main/main.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/main/main.component.scss rename to projects/social_platform/src/app/ui/pages/program/main/main.component.scss diff --git a/projects/social_platform/src/app/office/program/main/main.component.spec.ts b/projects/social_platform/src/app/ui/pages/program/main/main.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/main/main.component.spec.ts rename to projects/social_platform/src/app/ui/pages/program/main/main.component.spec.ts diff --git a/projects/social_platform/src/app/office/program/main/main.component.ts b/projects/social_platform/src/app/ui/pages/program/main/main.component.ts similarity index 94% rename from projects/social_platform/src/app/office/program/main/main.component.ts rename to projects/social_platform/src/app/ui/pages/program/main/main.component.ts index 7d14e73d..b07d4c1b 100644 --- a/projects/social_platform/src/app/office/program/main/main.component.ts +++ b/projects/social_platform/src/app/ui/pages/program/main/main.component.ts @@ -11,15 +11,15 @@ import { Subscription, switchMap, } from "rxjs"; -import { Program } from "@office/program/models/program.model"; -import { NavService } from "@office/services/nav.service"; +import { NavService } from "@ui/services/nav/nav.service"; import Fuse from "fuse.js"; import { CheckboxComponent, SelectComponent } from "@ui/components"; import { generateOptionsList } from "@utils/generate-options-list"; import { ClickOutsideModule } from "ng-click-outside"; -import { ProgramCardComponent } from "../shared/program-card/program-card.component"; +import { ProgramCardComponent } from "../../../shared/program-card/program-card.component"; import { HttpParams } from "@angular/common/http"; -import { ProgramService } from "../services/program.service"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; +import { Program } from "projects/social_platform/src/app/domain/program/program.model"; /** * Главный компонент списка программ diff --git a/projects/social_platform/src/app/office/program/main/main.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/program/main/main.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/main/main.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/program/main/main.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/program/main/main.resolver.ts b/projects/social_platform/src/app/ui/pages/program/main/main.resolver.ts similarity index 85% rename from projects/social_platform/src/app/office/program/main/main.resolver.ts rename to projects/social_platform/src/app/ui/pages/program/main/main.resolver.ts index bf91ddbe..5125e57c 100644 --- a/projects/social_platform/src/app/office/program/main/main.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/program/main/main.resolver.ts @@ -1,10 +1,10 @@ /** @format */ import { inject } from "@angular/core"; -import { ProgramService } from "@office/program/services/program.service"; import { ResolveFn } from "@angular/router"; -import { ApiPagination } from "@models/api-pagination.model"; -import { Program } from "@office/program/models/program.model"; +import { ProgramService } from "projects/social_platform/src/app/api/program/program.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { Program } from "projects/social_platform/src/app/domain/program/program.model"; /** * Резолвер для предзагрузки списка программ diff --git a/projects/social_platform/src/app/office/program/program.component.html b/projects/social_platform/src/app/ui/pages/program/program.component.html similarity index 100% rename from projects/social_platform/src/app/office/program/program.component.html rename to projects/social_platform/src/app/ui/pages/program/program.component.html diff --git a/projects/social_platform/src/app/office/program/program.component.scss b/projects/social_platform/src/app/ui/pages/program/program.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/program.component.scss rename to projects/social_platform/src/app/ui/pages/program/program.component.scss diff --git a/projects/social_platform/src/app/office/program/program.component.spec.ts b/projects/social_platform/src/app/ui/pages/program/program.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/program.component.spec.ts rename to projects/social_platform/src/app/ui/pages/program/program.component.spec.ts diff --git a/projects/social_platform/src/app/office/program/program.component.ts b/projects/social_platform/src/app/ui/pages/program/program.component.ts similarity index 96% rename from projects/social_platform/src/app/office/program/program.component.ts rename to projects/social_platform/src/app/ui/pages/program/program.component.ts index 6c8b5146..09c93dc4 100644 --- a/projects/social_platform/src/app/office/program/program.component.ts +++ b/projects/social_platform/src/app/ui/pages/program/program.component.ts @@ -1,14 +1,14 @@ /** @format */ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { NavService } from "@services/nav.service"; +import { NavService } from "@ui/services/nav/nav.service"; import { ActivatedRoute, NavigationEnd, Router, RouterOutlet } from "@angular/router"; import { Subscription } from "rxjs"; import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; import { SearchComponent } from "@ui/components/search/search.component"; import { BarComponent } from "@ui/components"; -import { ProgramService } from "./services/program.service"; import { BackComponent } from "@uilib"; +import { ProgramService } from "../../../api/program/program.service"; /** * Основной компонент модуля "Программы" diff --git a/projects/social_platform/src/app/office/projects/dashboard/dashboard.component.html b/projects/social_platform/src/app/ui/pages/projects/dashboard/dashboard.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/dashboard/dashboard.component.html rename to projects/social_platform/src/app/ui/pages/projects/dashboard/dashboard.component.html diff --git a/projects/social_platform/src/app/office/projects/dashboard/dashboard.component.scss b/projects/social_platform/src/app/ui/pages/projects/dashboard/dashboard.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/dashboard/dashboard.component.scss rename to projects/social_platform/src/app/ui/pages/projects/dashboard/dashboard.component.scss diff --git a/projects/social_platform/src/app/office/projects/dashboard/dashboard.component.ts b/projects/social_platform/src/app/ui/pages/projects/dashboard/dashboard.component.ts similarity index 89% rename from projects/social_platform/src/app/office/projects/dashboard/dashboard.component.ts rename to projects/social_platform/src/app/ui/pages/projects/dashboard/dashboard.component.ts index 374208b6..0037e984 100644 --- a/projects/social_platform/src/app/office/projects/dashboard/dashboard.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/dashboard/dashboard.component.ts @@ -3,10 +3,10 @@ import { CommonModule } from "@angular/common"; import { Component, inject, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { Project } from "@office/models/project.model"; import { Subscription } from "rxjs"; -import { DashboardItemComponent } from "./shared/dashboardItem/dashboardItem.component"; +import { DashboardItemComponent } from "../../../shared/dashboardItem/dashboardItem.component"; import { DashboardItem, dashboardItemBuilder } from "@utils/helpers/dashboardItemBuilder"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; @Component({ selector: "app-dashboard", diff --git a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/chat/chat.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/chat/chat.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.spec.ts b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.spec.ts similarity index 92% rename from projects/social_platform/src/app/office/projects/detail/chat/chat.component.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.spec.ts index 73fa9a61..67c8faad 100644 --- a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { ProjectChatComponent } from "./chat.component"; import { ReactiveFormsModule } from "@angular/forms"; -import { MessageInputComponent } from "@office/features/message-input/message-input.component"; +import { MessageInputComponent } from "@ui/components/message-input/message-input.component"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { AuthService } from "@auth/services"; import { RouterTestingModule } from "@angular/router/testing"; diff --git a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.ts similarity index 93% rename from projects/social_platform/src/app/office/projects/detail/chat/chat.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.ts index fbf86916..dcacb41a 100644 --- a/projects/social_platform/src/app/office/projects/detail/chat/chat.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.component.ts @@ -1,20 +1,23 @@ /** @format */ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from "@angular/core"; -import { ChatFile, ChatMessage } from "@models/chat-message.model"; +import { + ChatFile, + ChatMessage, +} from "projects/social_platform/src/app/domain/chat/chat-message.model"; import { filter, map, noop, Observable, Subscription, tap } from "rxjs"; -import { NavService } from "@services/nav.service"; +import { NavService } from "@ui/services/nav/nav.service"; import { ActivatedRoute, RouterLink } from "@angular/router"; -import { AuthService } from "@auth/services"; -import { ChatService } from "@services/chat.service"; -import { MessageInputComponent } from "@office/features/message-input/message-input.component"; -import { ChatWindowComponent } from "@office/features/chat-window/chat-window.component"; +import { ChatService } from "projects/social_platform/src/app/api/chat/chat.service"; +import { MessageInputComponent } from "@ui/components/message-input/message-input.component"; +import { ChatWindowComponent } from "@ui/components/chat-window/chat-window.component"; import { PluralizePipe } from "projects/core"; import { FileItemComponent } from "@ui/components/file-item/file-item.component"; import { IconComponent } from "@ui/components"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { ApiPagination } from "@models/api-pagination.model"; -import { ProjectDataService } from "../services/project-data.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { ProjectDataService } from "../../../../../api/project/project-data.service"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * Компонент чата проекта diff --git a/projects/social_platform/src/app/office/projects/detail/chat/chat.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.resolver.spec.ts similarity index 89% rename from projects/social_platform/src/app/office/projects/detail/chat/chat.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.resolver.spec.ts index f007c7ef..ffc4c053 100644 --- a/projects/social_platform/src/app/office/projects/detail/chat/chat.resolver.spec.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.resolver.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from "@angular/core/testing"; import { ProjectChatResolver } from "./chat.resolver"; -import { ProjectService } from "@services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { ActivatedRouteSnapshot, convertToParamMap, RouterStateSnapshot } from "@angular/router"; import { of } from "rxjs"; diff --git a/projects/social_platform/src/app/office/projects/detail/chat/chat.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.resolver.ts similarity index 78% rename from projects/social_platform/src/app/office/projects/detail/chat/chat.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.resolver.ts index 20b2074f..d8a08c9d 100644 --- a/projects/social_platform/src/app/office/projects/detail/chat/chat.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/chat/chat.resolver.ts @@ -2,10 +2,10 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { Project } from "@models/project.model"; -import { ProjectService } from "@services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { tap } from "rxjs"; -import { ProjectDataService } from "../services/project-data.service"; +import { ProjectDataService } from "../../../../../api/project/project-data.service"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; /** * Резолвер для загрузки данных проекта для чата diff --git a/projects/social_platform/src/app/office/projects/detail/detail.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/detail/detail.resolver.ts similarity index 72% rename from projects/social_platform/src/app/office/projects/detail/detail.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/detail.resolver.ts index aa1df683..0b64b427 100644 --- a/projects/social_platform/src/app/office/projects/detail/detail.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/detail.resolver.ts @@ -3,11 +3,11 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; import { forkJoin, of, switchMap, tap } from "rxjs"; -import { ProjectService } from "@services/project.service"; -import { Project } from "@models/project.model"; -import { SubscriptionService } from "@office/services/subscription.service"; -import { ProjectSubscriber } from "@office/models/project-subscriber.model"; -import { ProjectDataService } from "./services/project-data.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { SubscriptionService } from "projects/social_platform/src/app/api/subsriptions/subscription.service"; +import { ProjectDataService } from "../../../../api/project/project-data.service"; +import { ProjectSubscriber } from "projects/social_platform/src/app/domain/project/project-subscriber.model"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; /** * Резолвер для загрузки данных проекта и его подписчиков diff --git a/projects/social_platform/src/app/office/projects/detail/info/info.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/info/info.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/info/info.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/info/info.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/info/info.component.spec.ts b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/info/info.component.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/detail/info/info.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.ts similarity index 90% rename from projects/social_platform/src/app/office/projects/detail/info/info.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.ts index be093863..54c908a5 100644 --- a/projects/social_platform/src/app/office/projects/detail/info/info.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.component.ts @@ -11,26 +11,25 @@ import { ViewChild, } from "@angular/core"; import { ActivatedRoute, RouterOutlet, RouterLink } from "@angular/router"; -import { User } from "@auth/models/user.model"; -import { AuthService } from "@auth/services"; -import { UserLinksPipe } from "@core/pipes/user-links.pipe"; -import { Project } from "@models/project.model"; -import { Collaborator } from "@office/models/collaborator.model"; -import { ProjectNewsService } from "@office/projects/detail/services/project-news.service"; -import { FeedNews } from "@office/projects/models/project-news.model"; -import { ProjectService } from "@office/services/project.service"; -import { IndustryService } from "@services/industry.service"; -import { NavService } from "@services/nav.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; +import { NavService } from "@ui/services/nav/nav.service"; import { expandElement } from "@utils/expand-element"; -import { containerSm } from "@utils/responsive"; import { ParseBreaksPipe, ParseLinksPipe } from "projects/core"; import { Observable, Subscription, map, noop, switchMap } from "rxjs"; import { DirectionItem, directionItemBuilder } from "@utils/helpers/directionItemBuilder"; -import { ProjectDirectionCard } from "../shared/project-direction-card/project-direction-card.component"; +import { ProjectDirectionCard } from "../../../../shared/project-direction-card/project-direction-card.component"; import { IconComponent } from "@uilib"; -import { NewsFormComponent } from "@office/features/news-form/news-form.component"; -import { NewsCardComponent } from "@office/features/news-card/news-card.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { NewsFormComponent } from "@ui/components/news-form/news-form.component"; +import { NewsCardComponent } from "@ui/components/news-card/news-card.component"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { UserLinksPipe } from "projects/core/src/lib/pipes/user/user-links.pipe"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { ProjectNewsService } from "projects/social_platform/src/app/api/project/project-news.service"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { FeedNews } from "projects/social_platform/src/app/domain/project/project-news.model"; /** * КОМПОНЕНТ ДЕТАЛЬНОЙ ИНФОРМАЦИИ О ПРОЕКТЕ diff --git a/projects/social_platform/src/app/office/projects/detail/info/info.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/info/info.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/info/info.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/projects/detail/info/info.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.resolver.ts similarity index 91% rename from projects/social_platform/src/app/office/projects/detail/info/info.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/info/info.resolver.ts index da40eeb4..5718a17f 100644 --- a/projects/social_platform/src/app/office/projects/detail/info/info.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/info/info.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { VacancyService } from "@services/vacancy.service"; -import { Vacancy } from "@models/vacancy.model"; +import { VacancyService } from "projects/social_platform/src/app/api/vacancy/vacancy.service"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; /** * РЕЗОЛВЕР ДЛЯ ЗАГРУЗКИ ВАКАНСИЙ ПРОЕКТА diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/actions/kanban-board-actions.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/actions/kanban-board-actions.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/actions/kanban-board-actions.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/actions/kanban-board-actions.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/actions/kanban-board-actions.component.ts similarity index 87% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/actions/kanban-board-actions.component.ts index 1e4d1d75..c87cdd4a 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/shared/actions/kanban-board-actions.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/actions/kanban-board-actions.component.ts @@ -3,7 +3,7 @@ import { CommonModule } from "@angular/common"; import { Component, EventEmitter, inject, Output } from "@angular/core"; import { IconComponent } from "@uilib"; -import { KanbanBoardDetailInfoService } from "../../services/kanban-board-detail-info.service"; +import { KanbanBoardDetailInfoService } from "../../../../../../../api/kanban/kanban-board-detail-info.service"; @Component({ selector: "app-kanban-board-actions", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/cancel-task-form/cancel-task-form.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/cancel-task-form/cancel-task-form.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/cancel-task-form/cancel-task-form.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/cancel-task-form/cancel-task-form.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/cancel-task-form/cancel-task-form.component.ts similarity index 95% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/cancel-task-form/cancel-task-form.component.ts index a05cf6b5..a9443038 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/shared/cancel-task-form/cancel-task-form.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/cancel-task-form/cancel-task-form.component.ts @@ -5,7 +5,7 @@ import { Component, EventEmitter, inject, Output } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { ControlErrorPipe, ValidationService } from "@corelib"; import { ButtonComponent } from "@ui/components"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; import { QuickAnswers } from "projects/core/src/consts/other/quick-answers.const"; import { TagComponent } from "@ui/components/tag/tag.component"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-board-form/create-board-form.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-board-form/create-board-form.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-board-form/create-board-form.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-board-form/create-board-form.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-board-form/create-board-form.component.ts similarity index 95% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-board-form/create-board-form.component.ts index dd50e6f5..27bf5042 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-board-form/create-board-form.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-board-form/create-board-form.component.ts @@ -6,7 +6,7 @@ import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angula import { Subscription } from "rxjs"; import { IconComponent } from "@ui/components"; import { ControlErrorPipe } from "@corelib"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { tagColors } from "projects/core/src/consts/other/tag-colors.const"; import { KanbanIcons } from "projects/core/src/consts/other/kanban-icons.const"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component.ts similarity index 97% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component.ts index 35e7296a..e3d1fadb 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/shared/create-tag-form/create-tag-form.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/create-tag-form/create-tag-form.component.ts @@ -19,7 +19,7 @@ import { ReactiveFormsModule, Validators, } from "@angular/forms"; -import { TagDto } from "../../models/dto/tag.model.dto"; +import { TagDto } from "../../../../../../../api/kanban/dto/tag.model.dto"; @Component({ selector: "app-create-tag-form", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/sidebar/kanban-board-sidebar.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/sidebar/kanban-board-sidebar.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/sidebar/kanban-board-sidebar.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/sidebar/kanban-board-sidebar.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/sidebar/kanban-board-sidebar.component.ts similarity index 92% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/sidebar/kanban-board-sidebar.component.ts index 1ca83a93..1a034fc2 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/shared/sidebar/kanban-board-sidebar.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/sidebar/kanban-board-sidebar.component.ts @@ -2,15 +2,15 @@ import { CommonModule } from "@angular/common"; import { Component, inject, Input, signal } from "@angular/core"; -import { Project } from "@office/models/project.model"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { KanbanBoardActionsComponent } from "../actions/kanban-board-actions.component"; import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; import { ClickOutsideModule } from "ng-click-outside"; -import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; import { Router } from "@angular/router"; -import { KanbanBoardInfoService } from "../../services/kanban-board-info.service"; +import { KanbanBoardInfoService } from "../../../../../../../api/kanban/kanban-board-info.service"; import { CreateBoardFormComponent } from "../create-board-form/create-board-form.component"; +import { ProjectDataService } from "projects/social_platform/src/app/api/project/project-data.service"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; @Component({ selector: "app-kanban-board-sidebar", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/detail/task-detail.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/detail/task-detail.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/detail/task-detail.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/detail/task-detail.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/detail/task-detail.component.ts similarity index 95% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/detail/task-detail.component.ts index 05d9c5cb..8f83d74d 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/detail/task-detail.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/detail/task-detail.component.ts @@ -35,31 +35,31 @@ import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; import { priorityInfoList } from "projects/core/src/consts/lists/priority-info-list.const"; import { ClickOutsideModule } from "ng-click-outside"; import { actionTypeList } from "projects/core/src/consts/lists/actiion-type-list.const"; -import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.component"; +import { SkillsGroupComponent } from "@ui/shared/skills-group/skills-group.component"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { SkillsService } from "@office/services/skills.service"; -import { Skill } from "@office/models/skill"; import { map, Subscription } from "rxjs"; -import { TaskDetail } from "../../../models/task.model"; +import { TaskDetail } from "../../../../../../../../domain/kanban/task.model"; import { daysUntil } from "@utils/days-untit"; -import { KanbanBoardService } from "../../../services/kanban-board.service"; +import { KanbanBoardService } from "../../../../../../../../api/kanban/kanban-board.service"; import { getPriorityType } from "@utils/helpers/getPriorityType"; import { getActionType } from "@utils/helpers/getActionType"; import { ActivatedRoute } from "@angular/router"; -import { FileService } from "@core/services/file.service"; +import { FileService } from "projects/core/src/lib/services/file/file.service"; import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; -import { ErrorMessage } from "@error/models/error-message"; -import { SnackbarService } from "@ui/services/snackbar.service"; -import { ChatMessage } from "@office/models/chat-message.model"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; +import { ChatMessage } from "projects/social_platform/src/app/domain/chat/chat-message.model"; import { CdkFixedSizeVirtualScroll, CdkVirtualForOf, CdkVirtualScrollViewport, } from "@angular/cdk/scrolling"; -import { TagDto } from "../../../models/dto/tag.model.dto"; -import { PerformerDto } from "../../../models/dto/performer.model.dto"; -import { KanbanBoardDetailInfoService } from "../../../services/kanban-board-detail-info.service"; -import { ProjectDataService } from "@office/projects/detail/services/project-data.service"; +import { TagDto } from "../../../../../../../../api/kanban/dto/tag.model.dto"; +import { PerformerDto } from "../../../../../../../../api/kanban/dto/performer.model.dto"; +import { KanbanBoardDetailInfoService } from "../../../../../../../../api/kanban/kanban-board-detail-info.service"; +import { SkillsService } from "projects/social_platform/src/app/api/skills/skills.service"; +import { ProjectDataService } from "projects/social_platform/src/app/api/project/project-data.service"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; @Component({ selector: "app-task-detail", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/kanban-task.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/kanban-task.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/kanban-task.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/kanban-task.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/kanban-task.component.ts similarity index 89% rename from projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/kanban-task.component.ts index 8d1abce2..c6a334f9 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/shared/task/kanban-task.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/components/task/kanban-task.component.ts @@ -7,8 +7,8 @@ import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { TagComponent } from "@ui/components/tag/tag.component"; import { RouterModule } from "@angular/router"; import { getPriorityType } from "@utils/helpers/getPriorityType"; -import { TaskPreview } from "../../models/task.model"; -import { KanbanBoardDetailInfoService } from "../../services/kanban-board-detail-info.service"; +import { TaskPreview } from "../../../../../../../domain/kanban/task.model"; +import { KanbanBoardDetailInfoService } from "../../../../../../../api/kanban/kanban-board-detail-info.service"; import { PluralizePipe } from "@corelib"; import { CancelTaskFormComponent } from "../cancel-task-form/cancel-task-form.component"; import { ModalComponent } from "@ui/components/modal/modal.component"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.component.ts similarity index 80% rename from projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.component.ts index 728c045e..671ba6a0 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.component.ts @@ -3,9 +3,9 @@ import { CommonModule } from "@angular/common"; import { Component, inject, OnInit, signal } from "@angular/core"; import { RouterOutlet, ActivatedRoute } from "@angular/router"; -import { KanbanBoardSidebarComponent } from "./shared/sidebar/kanban-board-sidebar.component"; -import { TaskDetailComponent } from "./shared/task/detail/task-detail.component"; -import { KanbanBoardDetailInfoService } from "./services/kanban-board-detail-info.service"; +import { KanbanBoardSidebarComponent } from "./components/sidebar/kanban-board-sidebar.component"; +import { TaskDetailComponent } from "./components/task/detail/task-detail.component"; +import { KanbanBoardDetailInfoService } from "../../../../../api/kanban/kanban-board-detail-info.service"; import { Subscription } from "rxjs"; import { ClickOutsideModule } from "ng-click-outside"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.resolver.ts similarity index 90% rename from projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.resolver.ts index 0face5e6..fd9fc4aa 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/kanban.resolver.ts @@ -1,7 +1,7 @@ /** @format */ import { inject } from "@angular/core"; -import { KanbanBoardService } from "./services/kanban-board.service"; +import { KanbanBoardService } from "../../../../../api/kanban/kanban-board.service"; import { ActivatedRouteSnapshot, Router } from "@angular/router"; import { catchError, map, of } from "rxjs"; diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component.ts similarity index 90% rename from projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component.ts index b64b7c02..8af05d9e 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/archive/kanban-archive.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component.ts @@ -5,10 +5,10 @@ import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; import { SearchComponent } from "@ui/components/search/search.component"; import { Subscription } from "rxjs"; -import { KanbanBoardDetailInfoService } from "../services/kanban-board-detail-info.service"; -import { TaskPreview } from "../models/task.model"; import { ActivatedRoute } from "@angular/router"; -import { KanbanTaskComponent } from "../shared/task/kanban-task.component"; +import { KanbanTaskComponent } from "../../components/task/kanban-task.component"; +import { KanbanBoardDetailInfoService } from "projects/social_platform/src/app/api/kanban/kanban-board-detail-info.service"; +import { TaskPreview } from "projects/social_platform/src/app/domain/kanban/task.model"; @Component({ selector: "app-kanban-archive", diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/board/kanban-board.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/board/kanban-board.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/board/kanban-board.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/board/kanban-board.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/board/kanban-board.component.ts similarity index 95% rename from projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/board/kanban-board.component.ts index f473245b..644d168c 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/board/kanban-board.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/kanban/pages/board/kanban-board.component.ts @@ -12,7 +12,6 @@ import { } from "@angular/core"; import { InputComponent } from "@ui/components"; import { DropdownComponent } from "@ui/components/dropdown/dropdown.component"; -import { KanbanTaskComponent } from "../shared/task/kanban-task.component"; import { CdkDrag, CdkDragDrop, @@ -20,15 +19,16 @@ import { moveItemInArray, transferArrayItem, } from "@angular/cdk/drag-drop"; -import { TaskPreview } from "../models/task.model"; import { kanbanColumnInfo } from "projects/core/src/consts/other/kanban-column-info.const"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { KanbanBoardDetailInfoService } from "../services/kanban-board-detail-info.service"; import { Subscription } from "rxjs"; -import { Column } from "../models/column.model"; import { IconComponent } from "@uilib"; import { ControlErrorPipe } from "@corelib"; +import { KanbanTaskComponent } from "../../components/task/kanban-task.component"; +import { KanbanBoardDetailInfoService } from "projects/social_platform/src/app/api/kanban/kanban-board-detail-info.service"; +import { Column } from "projects/social_platform/src/app/domain/kanban/column.model"; +import { TaskPreview } from "projects/social_platform/src/app/domain/kanban/task.model"; @Component({ selector: "app-kanban-board", diff --git a/projects/social_platform/src/app/office/projects/detail/team/team.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/team/team.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/team/team.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/team/team.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/team/team.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/team/team.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/team/team.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/team/team.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/team/team.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/team/team.component.ts similarity index 85% rename from projects/social_platform/src/app/office/projects/detail/team/team.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/team/team.component.ts index 158a534f..25a8cd12 100644 --- a/projects/social_platform/src/app/office/projects/detail/team/team.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/team/team.component.ts @@ -3,11 +3,11 @@ import { CommonModule } from "@angular/common"; import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; import { IconComponent } from "@uilib"; -import { ProjectDataService } from "../services/project-data.service"; -import { InfoCardComponent } from "@office/features/info-card/info-card.component"; +import { InfoCardComponent } from "@ui/components/info-card/info-card.component"; import { filter, map, Subscription } from "rxjs"; -import { ProjectService } from "@office/services/project.service"; -import { AuthService } from "@auth/services"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { ProjectDataService } from "projects/social_platform/src/app/api/project/project-data.service"; /** * Компонент страницы команды в деательной информации о проекте diff --git a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/vacancies/vacancies.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/vacancies/vacancies.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/vacancies/vacancies.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/vacancies/vacancies.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/vacancies/vacancies.component.ts similarity index 82% rename from projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/vacancies/vacancies.component.ts index cc648e19..b5b44a2d 100644 --- a/projects/social_platform/src/app/office/projects/detail/vacancies/vacancies.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/vacancies/vacancies.component.ts @@ -3,10 +3,9 @@ import { CommonModule } from "@angular/common"; import { Component, inject, OnDestroy, OnInit } from "@angular/core"; import { IconComponent } from "@uilib"; -import { ProjectDataService } from "../services/project-data.service"; -import { Project } from "@office/models/project.model"; +import { ProjectDataService } from "../../../../../api/project/project-data.service"; import { Subscription } from "rxjs"; -import { ProjectVacancyCardComponent } from "../shared/project-vacancy-card/project-vacancy-card.component"; +import { ProjectVacancyCardComponent } from "../../../../shared/project-vacancy-card/project-vacancy-card.component"; /** * Компонент страницы вакансий в деательной информации о проекте diff --git a/projects/social_platform/src/app/office/projects/detail/work-section/responses.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/detail/work-section/responses.resolver.ts similarity index 80% rename from projects/social_platform/src/app/office/projects/detail/work-section/responses.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/work-section/responses.resolver.ts index 2cfa12af..1eb95377 100644 --- a/projects/social_platform/src/app/office/projects/detail/work-section/responses.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/work-section/responses.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; -import { VacancyResponse } from "@models/vacancy-response.model"; -import { VacancyService } from "@services/vacancy.service"; +import { VacancyService } from "projects/social_platform/src/app/api/vacancy/vacancy.service"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; /** * Резолвер для загрузки откликов на вакансии проекта diff --git a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html b/projects/social_platform/src/app/ui/pages/projects/detail/work-section/work-section.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.html rename to projects/social_platform/src/app/ui/pages/projects/detail/work-section/work-section.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.scss b/projects/social_platform/src/app/ui/pages/projects/detail/work-section/work-section.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.scss rename to projects/social_platform/src/app/ui/pages/projects/detail/work-section/work-section.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.ts b/projects/social_platform/src/app/ui/pages/projects/detail/work-section/work-section.component.ts similarity index 91% rename from projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.ts rename to projects/social_platform/src/app/ui/pages/projects/detail/work-section/work-section.component.ts index e1e743ef..6702ae5c 100644 --- a/projects/social_platform/src/app/office/projects/detail/work-section/work-section.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/detail/work-section/work-section.component.ts @@ -6,8 +6,8 @@ import { ButtonComponent } from "@ui/components"; import { IconComponent } from "@uilib"; import { map, Subscription } from "rxjs"; import { ActivatedRoute, RouterLink } from "@angular/router"; -import { VacancyResponse } from "@office/models/vacancy-response.model"; -import { VacancyService } from "@office/services/vacancy.service"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; +import { VacancyService } from "projects/social_platform/src/app/api/vacancy/vacancy.service"; @Component({ selector: "app-work-section", diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-achievement-step/project-achievement-step.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-achievement-step/project-achievement-step.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-achievement-step/project-achievement-step.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-achievement-step/project-achievement-step.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-achievement-step/project-achievement-step.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-achievement-step/project-achievement-step.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-achievement-step/project-achievement-step.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-achievement-step/project-achievement-step.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-achievement-step/project-achievement-step.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-achievement-step/project-achievement-step.component.ts similarity index 93% rename from projects/social_platform/src/app/office/projects/edit/shared/project-achievement-step/project-achievement-step.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-achievement-step/project-achievement-step.component.ts index feea7d42..53ba0dfa 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-achievement-step/project-achievement-step.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-achievement-step/project-achievement-step.component.ts @@ -5,9 +5,9 @@ import { Component, inject, Input } from "@angular/core"; import { FormArray, FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; import { InputComponent, ButtonComponent } from "@ui/components"; import { ControlErrorPipe } from "@corelib"; -import { ErrorMessage } from "@error/models/error-message"; -import { ProjectFormService } from "../../services/project-form.service"; -import { ProjectAchievementsService } from "../../services/project-achievements.service"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ProjectFormService } from "../../../../../../api/project/project-form.service"; +import { ProjectAchievementsService } from "../../../../../../api/project/project-achievements.service"; import { IconComponent } from "@uilib"; @Component({ diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-additional-step/project-additional-step.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-additional-step/project-additional-step.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-additional-step/project-additional-step.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-additional-step/project-additional-step.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-additional-step/project-additional-step.component.ts similarity index 90% rename from projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-additional-step/project-additional-step.component.ts index e4e0486a..1d41b13b 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-additional-step/project-additional-step.component.ts @@ -12,10 +12,10 @@ import { import { TextareaComponent } from "@ui/components/textarea/textarea.component"; import { SwitchComponent } from "@ui/components/switch/switch.component"; import { ControlErrorPipe } from "@corelib"; -import { ErrorMessage } from "@error/models/error-message"; -import { ToSelectOptionsPipe } from "projects/core/src/lib/pipes/options-transform.pipe"; -import { ProjectAdditionalService } from "../../services/project-additional.service"; -import { PartnerProgramFields } from "@office/models/partner-program-fields.model"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ToSelectOptionsPipe } from "projects/core/src/lib/pipes/transformers/options-transform.pipe"; +import { ProjectAdditionalService } from "../../../../../../api/project/project-additional.service"; +import { PartnerProgramFields } from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; import { RouterLink } from "@angular/router"; import { IconComponent } from "@uilib"; import { TooltipComponent } from "@ui/components/tooltip/tooltip.component"; diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-main-step/project-main-step.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-main-step/project-main-step.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-main-step/project-main-step.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-main-step/project-main-step.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-main-step/project-main-step.component.ts similarity index 93% rename from projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-main-step/project-main-step.component.ts index e5ccc408..24506d61 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-main-step/project-main-step.component.ts @@ -9,8 +9,7 @@ import { ReactiveFormsModule, Validators, } from "@angular/forms"; -import { AuthService } from "@auth/services"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { directionProjectList } from "projects/core/src/consts/lists/direction-project-list.const"; import { trackProjectList } from "projects/core/src/consts/lists/track-project-list.const"; import { Observable, Subscription } from "rxjs"; @@ -20,16 +19,17 @@ import { TextareaComponent } from "@ui/components/textarea/textarea.component"; import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; import { AsyncPipe, CommonModule } from "@angular/common"; import { ControlErrorPipe } from "@corelib"; -import { ProjectFormService } from "../../services/project-form.service"; +import { ProjectFormService } from "../../../../../../api/project/project-form.service"; import { IconComponent } from "@uilib"; -import { ProjectContactsService } from "../../services/project-contacts.service"; -import { ProjectGoalService } from "../../services/project-goals.service"; +import { ProjectContactsService } from "../../../../../../api/project/project-contacts.service"; +import { ProjectGoalService } from "../../../../../../api/project/project-goals.service"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { ProjectTeamService } from "../../services/project-team.service"; +import { ProjectTeamService } from "../../../../../../api/project/project-team.service"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { RouterLink } from "@angular/router"; import { generateOptionsList } from "@utils/generate-options-list"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; @Component({ selector: "app-project-main-step", diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-navigation/project-navigation.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-navigation/project-navigation.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-navigation/project-navigation.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-navigation/project-navigation.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-navigation/project-navigation.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-navigation/project-navigation.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-navigation/project-navigation.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-navigation/project-navigation.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-navigation/project-navigation.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-navigation/project-navigation.component.ts similarity index 89% rename from projects/social_platform/src/app/office/projects/edit/shared/project-navigation/project-navigation.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-navigation/project-navigation.component.ts index 112d15c5..009ed755 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-navigation/project-navigation.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-navigation/project-navigation.component.ts @@ -1,7 +1,7 @@ /** @format */ import { Component, inject, Output, EventEmitter } from "@angular/core"; -import { EditStep, ProjectStepService } from "../../services/project-step.service"; +import { EditStep, ProjectStepService } from "../../../../../../api/project/project-step.service"; import { IconComponent } from "@uilib"; import { CommonModule } from "@angular/common"; import { navProjectItems } from "projects/core/src/consts/navigation/nav-project-items.const"; diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-partner-resources-step/project-partner-resources-step.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-partner-resources-step/project-partner-resources-step.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-partner-resources-step/project-partner-resources-step.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-partner-resources-step/project-partner-resources-step.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-partner-resources-step/project-partner-resources-step.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-partner-resources-step/project-partner-resources-step.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-partner-resources-step/project-partner-resources-step.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-partner-resources-step/project-partner-resources-step.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-partner-resources-step/project-partner-resources-step.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-partner-resources-step/project-partner-resources-step.component.ts similarity index 92% rename from projects/social_platform/src/app/office/projects/edit/shared/project-partner-resources-step/project-partner-resources-step.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-partner-resources-step/project-partner-resources-step.component.ts index 158defc4..4e8c313b 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-partner-resources-step/project-partner-resources-step.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-partner-resources-step/project-partner-resources-step.component.ts @@ -3,15 +3,15 @@ import { CommonModule } from "@angular/common"; import { Component, inject, Input, OnDestroy } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { IconComponent } from "@uilib"; -import { ProjectPartnerService } from "../../services/project-partner.service"; -import { ProjectResourceService } from "../../services/project-resources.service"; +import { ProjectPartnerService } from "../../../../../../api/project/project-partner.service"; +import { ProjectResourceService } from "../../../../../../api/project/project-resources.service"; import { ButtonComponent, InputComponent, SelectComponent } from "@ui/components"; import { Subscription } from "rxjs"; import { ControlErrorPipe } from "@corelib"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; -import { ProjectService } from "@office/services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { optionsListElement } from "@utils/generate-options-list"; import { resourceOptionsList } from "projects/core/src/consts/lists/resource-options-list.const"; diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-team-step/project-team-step.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-team-step/project-team-step.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-team-step/project-team-step.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-team-step/project-team-step.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-team-step/project-team-step.component.ts similarity index 91% rename from projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-team-step/project-team-step.component.ts index 9d757b94..1d771c9f 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-team-step/project-team-step.component.ts @@ -5,16 +5,16 @@ import { Component, inject, OnInit } from "@angular/core"; import { FormGroup, ReactiveFormsModule } from "@angular/forms"; import { InputComponent, ButtonComponent, SelectComponent } from "@ui/components"; import { ControlErrorPipe } from "@corelib"; -import { ErrorMessage } from "@error/models/error-message"; -import { InviteCardComponent } from "@office/features/invite-card/invite-card.component"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { InviteCardComponent } from "@ui/components/invite-card/invite-card.component"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { ProjectTeamService } from "../../services/project-team.service"; +import { ProjectTeamService } from "../../../../../../api/project/project-team.service"; import { rolesMembersList } from "projects/core/src/consts/lists/roles-members-list.const"; import { ActivatedRoute } from "@angular/router"; import { IconComponent } from "@uilib"; -import { CollaboratorCardComponent } from "@office/shared/collaborator-card/collaborator-card.component"; +import { CollaboratorCardComponent } from "@ui/shared/collaborator-card/collaborator-card.component"; import { TooltipComponent } from "@ui/components/tooltip/tooltip.component"; -import { Collaborator } from "@office/models/collaborator.model"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; @Component({ selector: "app-project-team-step", diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-vacancy-step/project-vacancy-step.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-vacancy-step/project-vacancy-step.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-vacancy-step/project-vacancy-step.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-vacancy-step/project-vacancy-step.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-vacancy-step/project-vacancy-step.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-vacancy-step/project-vacancy-step.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/shared/project-vacancy-step/project-vacancy-step.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-vacancy-step/project-vacancy-step.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-vacancy-step/project-vacancy-step.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-vacancy-step/project-vacancy-step.component.ts similarity index 91% rename from projects/social_platform/src/app/office/projects/edit/shared/project-vacancy-step/project-vacancy-step.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/components/project-vacancy-step/project-vacancy-step.component.ts index e17b9a27..6418e7c6 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-vacancy-step/project-vacancy-step.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/components/project-vacancy-step/project-vacancy-step.component.ts @@ -5,15 +5,15 @@ import { Component, inject, Input, Output, EventEmitter, OnInit } from "@angular import { FormGroup, ReactiveFormsModule } from "@angular/forms"; import { InputComponent, ButtonComponent, SelectComponent } from "@ui/components"; import { ControlErrorPipe } from "@corelib"; -import { ErrorMessage } from "@error/models/error-message"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { AutoCompleteInputComponent } from "@ui/components/autocomplete-input/autocomplete-input.component"; -import { SkillsBasketComponent } from "@office/shared/skills-basket/skills-basket.component"; -import { VacancyCardComponent } from "@office/features/vacancy-card/vacancy-card.component"; -import { Skill } from "@office/models/skill"; -import { ProjectVacancyService } from "../../services/project-vacancy.service"; +import { SkillsBasketComponent } from "@ui/shared/skills-basket/skills-basket.component"; +import { VacancyCardComponent } from "@ui/components/vacancy-card/vacancy-card.component"; +import { ProjectVacancyService } from "../../../../../../api/project/project-vacancy.service"; import { ActivatedRoute } from "@angular/router"; import { IconComponent } from "@uilib"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; @Component({ selector: "app-project-vacancy-step", diff --git a/projects/social_platform/src/app/office/projects/edit/edit.component.html b/projects/social_platform/src/app/ui/pages/projects/edit/edit.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/edit.component.html rename to projects/social_platform/src/app/ui/pages/projects/edit/edit.component.html diff --git a/projects/social_platform/src/app/office/projects/edit/edit.component.scss b/projects/social_platform/src/app/ui/pages/projects/edit/edit.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/edit.component.scss rename to projects/social_platform/src/app/ui/pages/projects/edit/edit.component.scss diff --git a/projects/social_platform/src/app/office/projects/edit/edit.component.spec.ts b/projects/social_platform/src/app/ui/pages/projects/edit/edit.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/edit.component.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/edit.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/edit/edit.component.ts b/projects/social_platform/src/app/ui/pages/projects/edit/edit.component.ts similarity index 88% rename from projects/social_platform/src/app/office/projects/edit/edit.component.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/edit.component.ts index a4ccc442..a7cf6c7b 100644 --- a/projects/social_platform/src/app/office/projects/edit/edit.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/edit.component.ts @@ -10,16 +10,12 @@ import { } from "@angular/core"; import { Form, FormArray, FormGroup, ReactiveFormsModule } from "@angular/forms"; import { ActivatedRoute, Router, RouterModule } from "@angular/router"; -import { ErrorMessage } from "@error/models/error-message"; -import { Invite } from "@models/invite.model"; -import { Project } from "@models/project.model"; -import { Skill } from "@office/models/skill"; -import { ProgramService } from "@office/program/services/program.service"; -import { SkillsService } from "@office/services/skills.service"; -import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.component"; -import { IndustryService } from "@services/industry.service"; -import { NavService } from "@services/nav.service"; -import { ProjectService } from "@services/project.service"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { SkillsGroupComponent } from "@ui/shared/skills-group/skills-group.component"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; +import { NavService } from "@ui/services/nav/nav.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { ButtonComponent, IconComponent, SelectComponent } from "@ui/components"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { ValidationService } from "projects/core"; @@ -34,28 +30,31 @@ import { tap, } from "rxjs"; import { CommonModule, AsyncPipe } from "@angular/common"; -import { ProjectNavigationComponent } from "./shared/project-navigation/project-navigation.component"; -import { EditStep, ProjectStepService } from "./services/project-step.service"; -import { ProjectMainStepComponent } from "./shared/project-main-step/project-main-step.component"; -import { ProjectFormService } from "./services/project-form.service"; -import { ProjectPartnerResourcesStepComponent } from "./shared/project-partner-resources-step/project-partner-resources-step.component"; -import { ProjectAchievementStepComponent } from "./shared/project-achievement-step/project-achievement-step.component"; -import { ProjectVacancyStepComponent } from "./shared/project-vacancy-step/project-vacancy-step.component"; -import { ProjectVacancyService } from "./services/project-vacancy.service"; -import { ProjectTeamStepComponent } from "./shared/project-team-step/project-team-step.component"; -import { ProjectTeamService } from "./services/project-team.service"; -import { ProjectAdditionalStepComponent } from "./shared/project-additional-step/project-additional-step.component"; -import { ProjectAdditionalService } from "./services/project-additional.service"; -import { ProjectAchievementsService } from "./services/project-achievements.service"; -import { Goal } from "@office/models/goals.model"; -import { ProjectGoalService } from "./services/project-goals.service"; -import { SnackbarService } from "@ui/services/snackbar.service"; -import { Resource } from "@office/models/resource.model"; -import { Partner } from "@office/models/partner.model"; -import { ProjectPartnerService } from "./services/project-partner.service"; -import { ProjectResourceService } from "./services/project-resources.service"; +import { ProjectNavigationComponent } from "./components/project-navigation/project-navigation.component"; +import { EditStep, ProjectStepService } from "../../../../api/project/project-step.service"; +import { ProjectMainStepComponent } from "./components/project-main-step/project-main-step.component"; +import { ProjectFormService } from "../../../../api/project/project-form.service"; +import { ProjectPartnerResourcesStepComponent } from "./components/project-partner-resources-step/project-partner-resources-step.component"; +import { ProjectAchievementStepComponent } from "./components/project-achievement-step/project-achievement-step.component"; +import { ProjectVacancyStepComponent } from "./components/project-vacancy-step/project-vacancy-step.component"; +import { ProjectVacancyService } from "../../../../api/project/project-vacancy.service"; +import { ProjectTeamStepComponent } from "./components/project-team-step/project-team-step.component"; +import { ProjectTeamService } from "../../../../api/project/project-team.service"; +import { ProjectAdditionalStepComponent } from "./components/project-additional-step/project-additional-step.component"; +import { ProjectAdditionalService } from "../../../../api/project/project-additional.service"; +import { ProjectAchievementsService } from "../../../../api/project/project-achievements.service"; +import { ProjectGoalService } from "../../../../api/project/project-goals.service"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; +import { ProjectPartnerService } from "../../../../api/project/project-partner.service"; +import { ProjectResourceService } from "../../../../api/project/project-resources.service"; import { HttpErrorResponse } from "@angular/common/http"; -import { ProjectAssign } from "../models/project-assign.model"; +import { SkillsService } from "projects/social_platform/src/app/api/skills/skills.service"; +import { ProjectAssign } from "projects/social_platform/src/app/domain/project/project-assign.model"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; +import { Goal } from "projects/social_platform/src/app/domain/project/goals.model"; +import { Resource } from "projects/social_platform/src/app/domain/project/resource.model"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { Partner } from "projects/social_platform/src/app/domain/project/partner.model"; /** * Компонент редактирования проекта diff --git a/projects/social_platform/src/app/office/projects/edit/edit.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/projects/edit/edit.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/edit/edit.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/edit.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/projects/edit/edit.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/edit/edit.resolver.ts similarity index 75% rename from projects/social_platform/src/app/office/projects/edit/edit.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/edit/edit.resolver.ts index 3d48dcba..6ead0da0 100644 --- a/projects/social_platform/src/app/office/projects/edit/edit.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/edit/edit.resolver.ts @@ -3,13 +3,13 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot, ResolveFn } from "@angular/router"; import { forkJoin } from "rxjs"; -import { ProjectService } from "@services/project.service"; -import { Project } from "@models/project.model"; -import { InviteService } from "@services/invite.service"; -import { Invite } from "@models/invite.model"; -import { Goal } from "@office/models/goals.model"; -import { Partner } from "@office/models/partner.model"; -import { Resource } from "@office/models/resource.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { Goal } from "projects/social_platform/src/app/domain/project/goals.model"; +import { Partner } from "projects/social_platform/src/app/domain/project/partner.model"; +import { Resource } from "projects/social_platform/src/app/domain/project/resource.model"; /** * Resolver для загрузки данных редактирования проекта diff --git a/projects/social_platform/src/app/office/projects/list/all.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/projects/list/all.resolver.spec.ts similarity index 88% rename from projects/social_platform/src/app/office/projects/list/all.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/list/all.resolver.spec.ts index 24ca08b6..831c2a00 100644 --- a/projects/social_platform/src/app/office/projects/list/all.resolver.spec.ts +++ b/projects/social_platform/src/app/ui/pages/projects/list/all.resolver.spec.ts @@ -4,7 +4,7 @@ import { TestBed } from "@angular/core/testing"; import { ProjectsAllResolver } from "./all.resolver"; import { of } from "rxjs"; -import { ProjectService } from "@services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router"; describe("ProjectsAllResolver", () => { diff --git a/projects/social_platform/src/app/office/projects/list/all.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/list/all.resolver.ts similarity index 88% rename from projects/social_platform/src/app/office/projects/list/all.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/list/all.resolver.ts index 99866ef4..dad5f126 100644 --- a/projects/social_platform/src/app/office/projects/list/all.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/list/all.resolver.ts @@ -1,11 +1,11 @@ /** @format */ import { inject } from "@angular/core"; -import { Project } from "@models/project.model"; -import { ProjectService } from "@services/project.service"; -import { ApiPagination } from "@models/api-pagination.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; import { ResolveFn } from "@angular/router"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; /** * РЕЗОЛВЕР ДЛЯ ПОЛУЧЕНИЯ ВСЕХ ПРОЕКТОВ diff --git a/projects/social_platform/src/app/office/projects/list/invites.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/list/invites.resolver.ts similarity index 80% rename from projects/social_platform/src/app/office/projects/list/invites.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/list/invites.resolver.ts index c280a11c..f685bb01 100644 --- a/projects/social_platform/src/app/office/projects/list/invites.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/list/invites.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ResolveFn } from "@angular/router"; -import { Invite } from "@office/models/invite.model"; -import { InviteService } from "@office/services/invite.service"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; /** * Резолвер для предзагрузки приглашений пользователя diff --git a/projects/social_platform/src/app/office/projects/list/list.component.html b/projects/social_platform/src/app/ui/pages/projects/list/list.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/list/list.component.html rename to projects/social_platform/src/app/ui/pages/projects/list/list.component.html diff --git a/projects/social_platform/src/app/office/projects/list/list.component.scss b/projects/social_platform/src/app/ui/pages/projects/list/list.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/list/list.component.scss rename to projects/social_platform/src/app/ui/pages/projects/list/list.component.scss diff --git a/projects/social_platform/src/app/office/projects/list/list.component.spec.ts b/projects/social_platform/src/app/ui/pages/projects/list/list.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/list/list.component.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/list/list.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/list/list.component.ts b/projects/social_platform/src/app/ui/pages/projects/list/list.component.ts similarity index 94% rename from projects/social_platform/src/app/office/projects/list/list.component.ts rename to projects/social_platform/src/app/ui/pages/projects/list/list.component.ts index 02987d18..e83b774e 100644 --- a/projects/social_platform/src/app/office/projects/list/list.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/list/list.component.ts @@ -24,17 +24,17 @@ import { tap, throttleTime, } from "rxjs"; -import { AuthService } from "@auth/services"; -import { Project } from "@models/project.model"; -import { User } from "@auth/models/user.model"; -import { NavService } from "@services/nav.service"; -import { ProjectService } from "@services/project.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { NavService } from "@ui/services/nav/nav.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { HttpParams } from "@angular/common/http"; -import { ApiPagination } from "@models/api-pagination.model"; -import { InfoCardComponent } from "../../features/info-card/info-card.component"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { IconComponent } from "@ui/components"; -import { SubscriptionService } from "@office/services/subscription.service"; +import { SubscriptionService } from "projects/social_platform/src/app/api/subsriptions/subscription.service"; import { inviteToProjectMapper } from "@utils/helpers/inviteToProjectMapper"; +import { InfoCardComponent } from "@ui/components/info-card/info-card.component"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; /** * КОМПОНЕНТ СПИСКА ПРОЕКТОВ diff --git a/projects/social_platform/src/app/office/projects/list/my.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/projects/list/my.resolver.spec.ts similarity index 87% rename from projects/social_platform/src/app/office/projects/list/my.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/list/my.resolver.spec.ts index 672f73f1..c7e452d3 100644 --- a/projects/social_platform/src/app/office/projects/list/my.resolver.spec.ts +++ b/projects/social_platform/src/app/ui/pages/projects/list/my.resolver.spec.ts @@ -4,7 +4,7 @@ import { TestBed } from "@angular/core/testing"; import { ProjectsMyResolver } from "./my.resolver"; import { of } from "rxjs"; -import { ProjectService } from "@services/project.service"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router"; describe("ProjectsMyResolver", () => { diff --git a/projects/social_platform/src/app/office/projects/list/my.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/list/my.resolver.ts similarity index 89% rename from projects/social_platform/src/app/office/projects/list/my.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/list/my.resolver.ts index d2547601..43af055c 100644 --- a/projects/social_platform/src/app/office/projects/list/my.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/list/my.resolver.ts @@ -1,11 +1,11 @@ /** @format */ import { inject } from "@angular/core"; -import { Project } from "@models/project.model"; -import { ProjectService } from "@services/project.service"; -import { ApiPagination } from "@models/api-pagination.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { HttpParams } from "@angular/common/http"; import { ResolveFn } from "@angular/router"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; /** * РЕЗОЛВЕР ДЛЯ ПОЛУЧЕНИЯ ПРОЕКТОВ ТЕКУЩЕГО ПОЛЬЗОВАТЕЛЯ diff --git a/projects/social_platform/src/app/office/projects/list/subscriptions.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/list/subscriptions.resolver.ts similarity index 91% rename from projects/social_platform/src/app/office/projects/list/subscriptions.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/list/subscriptions.resolver.ts index 0ca78a23..c96ddd5b 100644 --- a/projects/social_platform/src/app/office/projects/list/subscriptions.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/list/subscriptions.resolver.ts @@ -2,10 +2,10 @@ import { ResolveFn } from "@angular/router"; import { inject } from "@angular/core"; -import { AuthService } from "@auth/services"; import { switchMap } from "rxjs"; -import { Project } from "@office/models/project.model"; -import { SubscriptionService } from "@office/services/subscription.service"; +import { SubscriptionService } from "projects/social_platform/src/app/api/subsriptions/subscription.service"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; /** * РЕЗОЛВЕР ДЛЯ ПОЛУЧЕНИЯ ПОДПИСОК ПОЛЬЗОВАТЕЛЯ diff --git a/projects/social_platform/src/app/office/projects/projects.component.html b/projects/social_platform/src/app/ui/pages/projects/projects.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/projects.component.html rename to projects/social_platform/src/app/ui/pages/projects/projects.component.html diff --git a/projects/social_platform/src/app/office/projects/projects.component.scss b/projects/social_platform/src/app/ui/pages/projects/projects.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/projects.component.scss rename to projects/social_platform/src/app/ui/pages/projects/projects.component.scss diff --git a/projects/social_platform/src/app/office/projects/projects.component.spec.ts b/projects/social_platform/src/app/ui/pages/projects/projects.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/projects.component.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/projects.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/projects.component.ts b/projects/social_platform/src/app/ui/pages/projects/projects.component.ts similarity index 92% rename from projects/social_platform/src/app/office/projects/projects.component.ts rename to projects/social_platform/src/app/ui/pages/projects/projects.component.ts index 998b25b6..6b8e4b8d 100644 --- a/projects/social_platform/src/app/office/projects/projects.component.ts +++ b/projects/social_platform/src/app/ui/pages/projects/projects.component.ts @@ -1,7 +1,7 @@ /** @format */ import { Component, ElementRef, OnDestroy, OnInit, Renderer2, ViewChild } from "@angular/core"; -import { NavService } from "@services/nav.service"; +import { NavService } from "@ui/services/nav/nav.service"; import { ActivatedRoute, NavigationEnd, Router, RouterOutlet } from "@angular/router"; import { map, Subscription } from "rxjs"; import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; @@ -9,12 +9,12 @@ import { SearchComponent } from "@ui/components/search/search.component"; import { ButtonComponent, IconComponent } from "@ui/components"; import { BarNewComponent } from "@ui/components/bar-new/bar.component"; import { BackComponent } from "@uilib"; -import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component"; -import { ProjectsFilterComponent } from "./projects-filter/projects-filter.component"; -import { Project } from "@office/models/project.model"; +import { SoonCardComponent } from "@ui/shared/soon-card/soon-card.component"; +import { ProjectsFilterComponent } from "../../components/projects-filter/projects-filter.component"; import { inviteToProjectMapper } from "@utils/helpers/inviteToProjectMapper"; -import { ProjectsService } from "./services/projects.service"; -import { InfoCardComponent } from "@office/features/info-card/info-card.component"; +import { ProjectsService } from "../../../api/project/projects.service"; +import { InfoCardComponent } from "@ui/components/info-card/info-card.component"; +import { Project } from "../../../domain/project/project.model"; /** * Главный компонент модуля проектов diff --git a/projects/social_platform/src/app/office/projects/projects.resolver.spec.ts b/projects/social_platform/src/app/ui/pages/projects/projects.resolver.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/projects.resolver.spec.ts rename to projects/social_platform/src/app/ui/pages/projects/projects.resolver.spec.ts diff --git a/projects/social_platform/src/app/office/projects/projects.resolver.ts b/projects/social_platform/src/app/ui/pages/projects/projects.resolver.ts similarity index 82% rename from projects/social_platform/src/app/office/projects/projects.resolver.ts rename to projects/social_platform/src/app/ui/pages/projects/projects.resolver.ts index c32dadf5..7b6507e8 100644 --- a/projects/social_platform/src/app/office/projects/projects.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/projects/projects.resolver.ts @@ -2,13 +2,13 @@ import { inject } from "@angular/core"; import { forkJoin, switchMap } from "rxjs"; -import { Project } from "@models/project.model"; -import { ProjectService } from "@services/project.service"; -import { AuthService } from "@auth/services"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { ResolveFn } from "@angular/router"; -import { SubscriptionService } from "@office/services/subscription.service"; +import { SubscriptionService } from "projects/social_platform/src/app/api/subsriptions/subscription.service"; import { HttpParams } from "@angular/common/http"; -import { ApiPagination } from "@office/models/api-pagination.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { Project } from "../../../domain/project/project.model"; +import { AuthService } from "../../../api/auth"; /** * Resolver для загрузки данных о количестве проектов diff --git a/projects/social_platform/src/app/office/vacancies/detail/info/info.component.html b/projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.html similarity index 100% rename from projects/social_platform/src/app/office/vacancies/detail/info/info.component.html rename to projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.html diff --git a/projects/social_platform/src/app/office/vacancies/detail/info/info.component.scss b/projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.scss similarity index 100% rename from projects/social_platform/src/app/office/vacancies/detail/info/info.component.scss rename to projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.scss diff --git a/projects/social_platform/src/app/office/vacancies/detail/info/info.component.spec.ts b/projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/vacancies/detail/info/info.component.spec.ts rename to projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.spec.ts diff --git a/projects/social_platform/src/app/office/vacancies/detail/info/info.component.ts b/projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.ts similarity index 91% rename from projects/social_platform/src/app/office/vacancies/detail/info/info.component.ts rename to projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.ts index c1cd6525..242317fe 100644 --- a/projects/social_platform/src/app/office/vacancies/detail/info/info.component.ts +++ b/projects/social_platform/src/app/ui/pages/vacancies/detail/info/info.component.ts @@ -10,34 +10,24 @@ import { ViewChild, } from "@angular/core"; import { ActivatedRoute, Router, RouterModule } from "@angular/router"; -import { AuthService } from "@auth/services"; -import { - ControlErrorPipe, - ParseBreaksPipe, - ParseLinksPipe, - SubscriptionPlan, - SubscriptionPlansService, - ValidationService, -} from "@corelib"; -import { Project } from "@office/models/project.model"; -import { Vacancy } from "@office/models/vacancy.model"; -import { ProjectService } from "@office/services/project.service"; +import { ControlErrorPipe, ParseBreaksPipe, ParseLinksPipe, ValidationService } from "@corelib"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; import { ButtonComponent } from "@ui/components"; import { ModalComponent } from "@ui/components/modal/modal.component"; import { TagComponent } from "@ui/components/tag/tag.component"; import { IconComponent } from "@uilib"; import { expandElement } from "@utils/expand-element"; -import { SalaryTransformPipe } from "projects/core/src/lib/pipes/salary-transform.pipe"; +import { SalaryTransformPipe } from "projects/core/src/lib/pipes/transformers/salary-transform.pipe"; import { map, Subscription } from "rxjs"; -import { CapitalizePipe } from "projects/core/src/lib/pipes/capitalize.pipe"; +import { CapitalizePipe } from "projects/core/src/lib/pipes/formatters/capitalize.pipe"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { UserLinksPipe } from "@core/pipes/user-links.pipe"; import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms"; -import { ErrorMessage } from "@error/models/error-message"; -import { VacancyService } from "@office/services/vacancy.service"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; import { TextareaComponent } from "@ui/components/textarea/textarea.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { UserLinksPipe } from "projects/core/src/lib/pipes/user/user-links.pipe"; +import { VacancyService } from "projects/social_platform/src/app/api/vacancy/vacancy.service"; /** * Компонент отображения детальной информации о вакансии diff --git a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.html b/projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.html similarity index 100% rename from projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.html rename to projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.html diff --git a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.scss b/projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.scss similarity index 100% rename from projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.scss rename to projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.scss diff --git a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.spec.ts b/projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.spec.ts rename to projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.spec.ts diff --git a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.ts b/projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.ts similarity index 96% rename from projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.ts rename to projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.ts index 3621c2dc..a0addea2 100644 --- a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.component.ts +++ b/projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.component.ts @@ -3,7 +3,7 @@ import { CommonModule } from "@angular/common"; import { Component, inject, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute, RouterOutlet } from "@angular/router"; -import { Vacancy } from "@office/models/vacancy.model"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; import { BarComponent } from "@ui/components"; import { map, Subscription } from "rxjs"; import { BackComponent } from "@uilib"; diff --git a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.resolver.ts b/projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.resolver.ts similarity index 93% rename from projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.resolver.ts rename to projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.resolver.ts index 52c14bb3..9e4fdf8c 100644 --- a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/vacancies/detail/vacancies-detail.resolver.ts @@ -2,7 +2,7 @@ import { inject } from "@angular/core"; import { ActivatedRouteSnapshot } from "@angular/router"; -import { VacancyService } from "@office/services/vacancy.service"; +import { VacancyService } from "projects/social_platform/src/app/api/vacancy/vacancy.service"; /** * Резолвер для загрузки детальной информации о конкретной вакансии diff --git a/projects/social_platform/src/app/office/vacancies/list/list.component.html b/projects/social_platform/src/app/ui/pages/vacancies/list/list.component.html similarity index 100% rename from projects/social_platform/src/app/office/vacancies/list/list.component.html rename to projects/social_platform/src/app/ui/pages/vacancies/list/list.component.html diff --git a/projects/social_platform/src/app/office/vacancies/list/list.component.scss b/projects/social_platform/src/app/ui/pages/vacancies/list/list.component.scss similarity index 100% rename from projects/social_platform/src/app/office/vacancies/list/list.component.scss rename to projects/social_platform/src/app/ui/pages/vacancies/list/list.component.scss diff --git a/projects/social_platform/src/app/office/vacancies/list/list.component.spec.ts b/projects/social_platform/src/app/ui/pages/vacancies/list/list.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/vacancies/list/list.component.spec.ts rename to projects/social_platform/src/app/ui/pages/vacancies/list/list.component.spec.ts diff --git a/projects/social_platform/src/app/office/vacancies/list/list.component.ts b/projects/social_platform/src/app/ui/pages/vacancies/list/list.component.ts similarity index 89% rename from projects/social_platform/src/app/office/vacancies/list/list.component.ts rename to projects/social_platform/src/app/ui/pages/vacancies/list/list.component.ts index cce757e4..76d140b2 100644 --- a/projects/social_platform/src/app/office/vacancies/list/list.component.ts +++ b/projects/social_platform/src/app/ui/pages/vacancies/list/list.component.ts @@ -17,15 +17,15 @@ import { tap, throttleTime, } from "rxjs"; -import { VacancyService } from "@office/services/vacancy.service"; -import { Vacancy } from "@office/models/vacancy.model"; -import { ApiPagination } from "@office/models/api-pagination.model"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; import { ActivatedRoute, Router, RouterLink } from "@angular/router"; -import { VacancyResponse } from "@office/models/vacancy-response.model"; -import { ResponseCardComponent } from "@office/features/response-card/response-card.component"; -import { ProjectVacancyCardComponent } from "@office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; import { ButtonComponent, IconComponent } from "@ui/components"; import { ModalComponent } from "@ui/components/modal/modal.component"; +import { ProjectVacancyCardComponent } from "@ui/shared/project-vacancy-card/project-vacancy-card.component"; +import { VacancyService } from "projects/social_platform/src/app/api/vacancy/vacancy.service"; +import { ResponseCardComponent } from "@ui/components/response-card/response-card.component"; @Component({ selector: "app-vacancies-list", diff --git a/projects/social_platform/src/app/office/vacancies/list/my.resolver.ts b/projects/social_platform/src/app/ui/pages/vacancies/list/my.resolver.ts similarity index 87% rename from projects/social_platform/src/app/office/vacancies/list/my.resolver.ts rename to projects/social_platform/src/app/ui/pages/vacancies/list/my.resolver.ts index 68fc8346..a1aec359 100644 --- a/projects/social_platform/src/app/office/vacancies/list/my.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/vacancies/list/my.resolver.ts @@ -2,8 +2,8 @@ import { inject } from "@angular/core"; import { ResolveFn } from "@angular/router"; -import { VacancyResponse } from "@office/models/vacancy-response.model"; -import { VacancyService } from "@office/services/vacancy.service"; +import { VacancyService } from "projects/social_platform/src/app/api/vacancy/vacancy.service"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; /** * Резолвер для загрузки откликов пользователя на вакансии diff --git a/projects/social_platform/src/app/office/vacancies/vacancies.component.html b/projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.html similarity index 100% rename from projects/social_platform/src/app/office/vacancies/vacancies.component.html rename to projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.html diff --git a/projects/social_platform/src/app/office/vacancies/vacancies.component.scss b/projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.scss similarity index 100% rename from projects/social_platform/src/app/office/vacancies/vacancies.component.scss rename to projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.scss diff --git a/projects/social_platform/src/app/office/vacancies/vacancies.component.spec.ts b/projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/vacancies/vacancies.component.spec.ts rename to projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.spec.ts diff --git a/projects/social_platform/src/app/office/vacancies/vacancies.component.ts b/projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.ts similarity index 95% rename from projects/social_platform/src/app/office/vacancies/vacancies.component.ts rename to projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.ts index 81b2bd86..1604f8ae 100644 --- a/projects/social_platform/src/app/office/vacancies/vacancies.component.ts +++ b/projects/social_platform/src/app/ui/pages/vacancies/vacancies.component.ts @@ -9,9 +9,9 @@ import { BarComponent } from "@ui/components"; import { ActivatedRoute, Router, RouterOutlet } from "@angular/router"; import { BackComponent } from "@uilib"; import { SearchComponent } from "@ui/components/search/search.component"; -import { VacancyFilterComponent } from "./shared/filter/vacancy-filter.component"; import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; import { debounceTime, distinctUntilChanged, tap } from "rxjs"; +import { VacancyFilterComponent } from "@ui/components/vacancy-filter/vacancy-filter.component"; @Component({ selector: "app-vacancies", diff --git a/projects/social_platform/src/app/office/vacancies/vacancies.resolver.ts b/projects/social_platform/src/app/ui/pages/vacancies/vacancies.resolver.ts similarity index 90% rename from projects/social_platform/src/app/office/vacancies/vacancies.resolver.ts rename to projects/social_platform/src/app/ui/pages/vacancies/vacancies.resolver.ts index 4b7ffcef..3a494735 100644 --- a/projects/social_platform/src/app/office/vacancies/vacancies.resolver.ts +++ b/projects/social_platform/src/app/ui/pages/vacancies/vacancies.resolver.ts @@ -1,7 +1,7 @@ /** @format */ import { inject } from "@angular/core"; -import { VacancyService } from "@office/services/vacancy.service"; +import { VacancyService } from "../../../api/vacancy/vacancy.service"; /** * Резолвер для предзагрузки списка вакансий diff --git a/projects/social_platform/src/app/auth/auth.routes.ts b/projects/social_platform/src/app/ui/routes/auth/auth.routes.ts similarity index 68% rename from projects/social_platform/src/app/auth/auth.routes.ts rename to projects/social_platform/src/app/ui/routes/auth/auth.routes.ts index ae80194f..24493d01 100644 --- a/projects/social_platform/src/app/auth/auth.routes.ts +++ b/projects/social_platform/src/app/ui/routes/auth/auth.routes.ts @@ -1,14 +1,14 @@ /** @format */ import { Routes } from "@angular/router"; -import { AuthComponent } from "./auth.component"; -import { LoginComponent } from "./login/login.component"; -import { RegisterComponent } from "./register/register.component"; -import { EmailVerificationComponent } from "./email-verification/email-verification.component"; -import { ConfirmEmailComponent } from "./confirm-email/confirm-email.component"; -import { ResetPasswordComponent } from "@auth/reset-password/reset-password.component"; -import { SetPasswordComponent } from "@auth/set-password/set-password.component"; -import { ConfirmPasswordResetComponent } from "@auth/confirm-password-reset/confirm-password-reset.component"; +import { AuthComponent } from "../../pages/auth/auth.component"; +import { ResetPasswordComponent } from "@ui/pages/auth/reset-password/reset-password.component"; +import { SetPasswordComponent } from "@ui/pages/auth/set-password/set-password.component"; +import { ConfirmPasswordResetComponent } from "@ui/pages/auth/confirm-password-reset/confirm-password-reset.component"; +import { LoginComponent } from "@ui/pages/auth/login/login.component"; +import { RegisterComponent } from "@ui/pages/auth/register/register.component"; +import { EmailVerificationComponent } from "@ui/pages/auth/email-verification/email-verification.component"; +import { ConfirmEmailComponent } from "@ui/pages/auth/confirm-email/confirm-email.component"; /** * Конфигурация маршрутов для модуля аутентификации diff --git a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct.routes.ts b/projects/social_platform/src/app/ui/routes/chat/chat-direct.routes.ts similarity index 80% rename from projects/social_platform/src/app/office/chat/chat-direct/chat-direct.routes.ts rename to projects/social_platform/src/app/ui/routes/chat/chat-direct.routes.ts index 4e68005f..4e9d0972 100644 --- a/projects/social_platform/src/app/office/chat/chat-direct/chat-direct.routes.ts +++ b/projects/social_platform/src/app/ui/routes/chat/chat-direct.routes.ts @@ -1,8 +1,8 @@ /** @format */ import { Routes } from "@angular/router"; -import { ChatDirectComponent } from "@office/chat/chat-direct/chat-direct/chat-direct.component"; -import { ChatDirectResolver } from "@office/chat/chat-direct/chat-direct/chat-direct.resolver"; +import { ChatDirectComponent } from "@ui/pages/chat/chat-direct/chat-direct.component"; +import { ChatDirectResolver } from "@ui/pages/chat/chat-direct/chat-direct.resolver"; /** * Конфигурация маршрутов для модуля прямого чата diff --git a/projects/social_platform/src/app/office/chat/chat.routes.ts b/projects/social_platform/src/app/ui/routes/chat/chat.routes.ts similarity index 73% rename from projects/social_platform/src/app/office/chat/chat.routes.ts rename to projects/social_platform/src/app/ui/routes/chat/chat.routes.ts index 103e278b..5f10d691 100644 --- a/projects/social_platform/src/app/office/chat/chat.routes.ts +++ b/projects/social_platform/src/app/ui/routes/chat/chat.routes.ts @@ -1,9 +1,9 @@ /** @format */ import { Routes } from "@angular/router"; -import { ChatComponent } from "@office/chat/chat.component"; -import { ChatResolver } from "@office/chat/chat.resolver"; -import { ChatGroupsResolver } from "@office/chat/chat-groups.resolver"; +import { ChatGroupsResolver } from "@ui/pages/chat/chat-groups.resolver"; +import { ChatComponent } from "@ui/pages/chat/chat.component"; +import { ChatResolver } from "@ui/pages/chat/chat.resolver"; /** * Маршруты для модуля чатов @@ -37,6 +37,6 @@ export const CHAT_ROUTES: Routes = [ }, { path: ":chatId", - loadChildren: () => import("./chat-direct/chat-direct.routes").then(c => c.CHAT_DIRECT_ROUTES), + loadChildren: () => import("../chat/chat-direct.routes").then(c => c.CHAT_DIRECT_ROUTES), }, ]; diff --git a/projects/social_platform/src/app/error/error.routes.ts b/projects/social_platform/src/app/ui/routes/error/error.routes.ts similarity index 85% rename from projects/social_platform/src/app/error/error.routes.ts rename to projects/social_platform/src/app/ui/routes/error/error.routes.ts index 7d4a1c9c..249c1063 100644 --- a/projects/social_platform/src/app/error/error.routes.ts +++ b/projects/social_platform/src/app/ui/routes/error/error.routes.ts @@ -1,9 +1,9 @@ /** @format */ import { Routes } from "@angular/router"; -import { ErrorComponent } from "./error.component"; -import { ErrorCodeComponent } from "./code/error-code.component"; -import { ErrorNotFoundComponent } from "./not-found/error-not-found.component"; +import { ErrorCodeComponent } from "@ui/pages/error/error-code/error-code.component"; +import { ErrorComponent } from "@ui/pages/error/error.component"; +import { ErrorNotFoundComponent } from "@ui/pages/error/not-found/error-not-found.component"; /** * Конфигурация маршрутов для модуля ошибок diff --git a/projects/social_platform/src/app/office/feed/feed.routes.ts b/projects/social_platform/src/app/ui/routes/feed/feed.routes.ts similarity index 94% rename from projects/social_platform/src/app/office/feed/feed.routes.ts rename to projects/social_platform/src/app/ui/routes/feed/feed.routes.ts index c7047e72..9ffac054 100644 --- a/projects/social_platform/src/app/office/feed/feed.routes.ts +++ b/projects/social_platform/src/app/ui/routes/feed/feed.routes.ts @@ -1,8 +1,8 @@ /** @format */ import { Routes } from "@angular/router"; -import { FeedComponent } from "@office/feed/feed.component"; -import { FeedResolver } from "@office/feed/feed.resolver"; +import { FeedComponent } from "@ui/pages/feed/feed.component"; +import { FeedResolver } from "@ui/pages/feed/feed.resolver"; /** * МАРШРУТЫ ДЛЯ МОДУЛЯ ЛЕНТЫ НОВОСТЕЙ diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/detail/kanban-detail.routes.ts b/projects/social_platform/src/app/ui/routes/kanban/kanban-detail.routes.ts similarity index 57% rename from projects/social_platform/src/app/office/projects/detail/kanban/detail/kanban-detail.routes.ts rename to projects/social_platform/src/app/ui/routes/kanban/kanban-detail.routes.ts index 71b58d88..b5a8c5f6 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/detail/kanban-detail.routes.ts +++ b/projects/social_platform/src/app/ui/routes/kanban/kanban-detail.routes.ts @@ -1,8 +1,8 @@ /** @format */ import { Routes } from "@angular/router"; -import { KanbanBoardComponent } from "../board/kanban-board.component"; -import { KanbanArhiveComponent } from "../archive/kanban-archive.component"; +import { KanbanArhiveComponent } from "@ui/pages/projects/detail/kanban/pages/archive/kanban-archive.component"; +import { KanbanBoardComponent } from "@ui/pages/projects/detail/kanban/pages/board/kanban-board.component"; export const KANBAN_DETAIL_ROUTES: Routes = [ { path: "", pathMatch: "full", redirectTo: "board" }, diff --git a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts b/projects/social_platform/src/app/ui/routes/kanban/kanban.routes.ts similarity index 57% rename from projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts rename to projects/social_platform/src/app/ui/routes/kanban/kanban.routes.ts index 11a881d3..f8575dce 100644 --- a/projects/social_platform/src/app/office/projects/detail/kanban/kanban.routes.ts +++ b/projects/social_platform/src/app/ui/routes/kanban/kanban.routes.ts @@ -5,6 +5,6 @@ import { Routes } from "@angular/router"; export const KANBAN_ROUTES: Routes = [ { path: ":kanbanId", - loadChildren: () => import("./detail/kanban-detail.routes").then(c => c.KANBAN_DETAIL_ROUTES), + loadChildren: () => import("./kanban-detail.routes").then(c => c.KANBAN_DETAIL_ROUTES), }, ]; diff --git a/projects/social_platform/src/app/office/office.routes.ts b/projects/social_platform/src/app/ui/routes/office/office.routes.ts similarity index 58% rename from projects/social_platform/src/app/office/office.routes.ts rename to projects/social_platform/src/app/ui/routes/office/office.routes.ts index ed1e43d2..5ae18c40 100644 --- a/projects/social_platform/src/app/office/office.routes.ts +++ b/projects/social_platform/src/app/ui/routes/office/office.routes.ts @@ -1,11 +1,11 @@ /** @format */ import { Routes } from "@angular/router"; -import { OfficeComponent } from "./office.component"; -import { ProfileEditComponent } from "./profile/edit/edit.component"; -import { MembersComponent } from "./members/members.component"; -import { MembersResolver } from "./members/members.resolver"; -import { OfficeResolver } from "./office.resolver"; +import { OfficeComponent } from "../../pages/office/office.component"; +import { ProfileEditComponent } from "../../pages/profile/edit/edit.component"; +import { OfficeResolver } from "../../pages/office/office.resolver"; +import { MembersComponent } from "@ui/pages/members/members.component"; +import { MembersResolver } from "@ui/pages/members/members.resolver"; /** * Конфигурация маршрутов для модуля офиса @@ -21,7 +21,7 @@ import { OfficeResolver } from "./office.resolver"; export const OFFICE_ROUTES: Routes = [ { path: "onboarding", - loadChildren: () => import("./onboarding/onboarding.routes").then(c => c.ONBOARDING_ROUTES), + loadChildren: () => import("../onboarding/onboarding.routes").then(c => c.ONBOARDING_ROUTES), }, { path: "", @@ -37,23 +37,23 @@ export const OFFICE_ROUTES: Routes = [ }, { path: "feed", - loadChildren: () => import("./feed/feed.routes").then(c => c.FEED_ROUTES), + loadChildren: () => import("../feed/feed.routes").then(c => c.FEED_ROUTES), }, { path: "vacancies", - loadChildren: () => import("./vacancies/vacancies.routes").then(c => c.VACANCIES_ROUTES), + loadChildren: () => import("../vacancy/vacancies.routes").then(c => c.VACANCIES_ROUTES), }, { path: "projects", - loadChildren: () => import("./projects/projects.routes").then(c => c.PROJECTS_ROUTES), + loadChildren: () => import("../projects/projects.routes").then(c => c.PROJECTS_ROUTES), }, { path: "program", - loadChildren: () => import("./program/program.routes").then(c => c.PROGRAM_ROUTES), + loadChildren: () => import("../program/program.routes").then(c => c.PROGRAM_ROUTES), }, { path: "chats", - loadChildren: () => import("./chat/chat.routes").then(c => c.CHAT_ROUTES), + loadChildren: () => import("../chat/chat.routes").then(c => c.CHAT_ROUTES), }, { path: "members", @@ -69,7 +69,7 @@ export const OFFICE_ROUTES: Routes = [ { path: "profile/:id", loadChildren: () => - import("./profile/detail/profile-detail.routes").then(c => c.PROFILE_DETAIL_ROUTES), + import("../profile/profile-detail.routes").then(c => c.PROFILE_DETAIL_ROUTES), }, { path: "**", diff --git a/projects/social_platform/src/app/office/onboarding/onboarding.routes.ts b/projects/social_platform/src/app/ui/routes/onboarding/onboarding.routes.ts similarity index 74% rename from projects/social_platform/src/app/office/onboarding/onboarding.routes.ts rename to projects/social_platform/src/app/ui/routes/onboarding/onboarding.routes.ts index cbe8596e..d7196772 100644 --- a/projects/social_platform/src/app/office/onboarding/onboarding.routes.ts +++ b/projects/social_platform/src/app/ui/routes/onboarding/onboarding.routes.ts @@ -1,13 +1,13 @@ /** @format */ import { Routes } from "@angular/router"; -import { OnboardingComponent } from "@office/onboarding/onboarding/onboarding.component"; -import { OnboardingStageZeroComponent } from "@office/onboarding/stage-zero/stage-zero.component"; -import { OnboardingStageOneComponent } from "@office/onboarding/stage-one/stage-one.component"; -import { OnboardingStageThreeComponent } from "@office/onboarding/stage-three/stage-three.component"; -import { StageOneResolver } from "./stage-one/stage-one.resolver"; -import { OnboardingStageTwoComponent } from "./stage-two/stage-two.component"; -import { StageTwoResolver } from "./stage-two/stage-two.resolver"; +import { StageOneResolver } from "../../pages/onboarding/stage-one/stage-one.resolver"; +import { OnboardingStageTwoComponent } from "../../pages/onboarding/stage-two/stage-two.component"; +import { StageTwoResolver } from "../../pages/onboarding/stage-two/stage-two.resolver"; +import { OnboardingComponent } from "@ui/pages/onboarding/onboarding.component"; +import { OnboardingStageZeroComponent } from "@ui/pages/onboarding/stage-zero/stage-zero.component"; +import { OnboardingStageOneComponent } from "@ui/pages/onboarding/stage-one/stage-one.component"; +import { OnboardingStageThreeComponent } from "@ui/pages/onboarding/stage-three/stage-three.component"; /** * ФАЙЛ МАРШРУТИЗАЦИИ ОНБОРДИНГА diff --git a/projects/social_platform/src/app/office/profile/detail/profile-detail.routes.ts b/projects/social_platform/src/app/ui/routes/profile/profile-detail.routes.ts similarity index 76% rename from projects/social_platform/src/app/office/profile/detail/profile-detail.routes.ts rename to projects/social_platform/src/app/ui/routes/profile/profile-detail.routes.ts index c78a7a86..dd265634 100644 --- a/projects/social_platform/src/app/office/profile/detail/profile-detail.routes.ts +++ b/projects/social_platform/src/app/ui/routes/profile/profile-detail.routes.ts @@ -1,12 +1,12 @@ /** @format */ import { Routes } from "@angular/router"; -import { ProfileDetailResolver } from "./profile-detail.resolver"; -import { ProfileMainComponent } from "./main/main.component"; -import { ProfileProjectsComponent } from "./projects/projects.component"; -import { ProfileMainResolver } from "./main/main.resolver"; -import { ProfileNewsComponent } from "../profile-news/profile-news.component"; -import { DeatilComponent } from "@office/features/detail/detail.component"; +import { ProfileDetailResolver } from "../../pages/profile/detail/profile-detail.resolver"; +import { ProfileMainComponent } from "../../pages/profile/detail/main/main.component"; +import { ProfileProjectsComponent } from "../../pages/profile/detail/projects/projects.component"; +import { ProfileMainResolver } from "../../pages/profile/detail/main/main.resolver"; +import { ProfileNewsComponent } from "../../shared/profile-news/profile-news.component"; +import { DeatilComponent } from "@ui/components/detail/detail.component"; /** * Конфигурация маршрутов для детального просмотра профиля пользователя diff --git a/projects/social_platform/src/app/office/program/detail/detail.routes.ts b/projects/social_platform/src/app/ui/routes/program/detail.routes.ts similarity index 70% rename from projects/social_platform/src/app/office/program/detail/detail.routes.ts rename to projects/social_platform/src/app/ui/routes/program/detail.routes.ts index 1a485d17..005af1f4 100644 --- a/projects/social_platform/src/app/office/program/detail/detail.routes.ts +++ b/projects/social_platform/src/app/ui/routes/program/detail.routes.ts @@ -1,14 +1,14 @@ /** @format */ import { Routes } from "@angular/router"; -import { ProgramDetailMainComponent } from "@office/program/detail/main/main.component"; -import { ProgramRegisterComponent } from "@office/program/detail/register/register.component"; -import { ProgramRegisterResolver } from "@office/program/detail/register/register.resolver"; -import { ProgramProjectsResolver } from "@office/program/detail/list/projects.resolver"; -import { ProgramMembersResolver } from "@office/program/detail/list/members.resolver"; -import { ProgramListComponent } from "./list/list.component"; -import { ProgramDetailResolver } from "./detail.resolver"; -import { DeatilComponent } from "@office/features/detail/detail.component"; +import { ProgramListComponent } from "../../pages/program/detail/list/list.component"; +import { ProgramDetailResolver } from "../../pages/program/detail/detail.resolver"; +import { DeatilComponent } from "@ui/components/detail/detail.component"; +import { ProgramDetailMainComponent } from "@ui/pages/program/detail/main/main.component"; +import { ProgramProjectsResolver } from "@ui/pages/program/detail/list/projects.resolver"; +import { ProgramMembersResolver } from "@ui/pages/program/detail/list/members.resolver"; +import { ProgramRegisterComponent } from "@ui/pages/program/detail/register/register.component"; +import { ProgramRegisterResolver } from "@ui/pages/program/detail/register/register.resolver"; /** * Маршруты для детальной страницы программы diff --git a/projects/social_platform/src/app/office/program/program.routes.ts b/projects/social_platform/src/app/ui/routes/program/program.routes.ts similarity index 78% rename from projects/social_platform/src/app/office/program/program.routes.ts rename to projects/social_platform/src/app/ui/routes/program/program.routes.ts index e1a17341..022cd4c7 100644 --- a/projects/social_platform/src/app/office/program/program.routes.ts +++ b/projects/social_platform/src/app/ui/routes/program/program.routes.ts @@ -1,9 +1,9 @@ /** @format */ import { Routes } from "@angular/router"; -import { ProgramComponent } from "./program.component"; -import { ProgramMainComponent } from "./main/main.component"; -import { ProgramMainResolver } from "./main/main.resolver"; +import { ProgramComponent } from "../../pages/program/program.component"; +import { ProgramMainComponent } from "../../pages/program/main/main.component"; +import { ProgramMainResolver } from "../../pages/program/main/main.resolver"; /** * Конфигурация маршрутов для модуля "Программы" @@ -38,6 +38,6 @@ export const PROGRAM_ROUTES: Routes = [ }, { path: ":programId", - loadChildren: () => import("./detail/detail.routes").then(c => c.PROGRAM_DETAIL_ROUTES), + loadChildren: () => import("./detail.routes").then(c => c.PROGRAM_DETAIL_ROUTES), }, ]; diff --git a/projects/social_platform/src/app/office/projects/detail/detail.routes.ts b/projects/social_platform/src/app/ui/routes/projects/detail.routes.ts similarity index 58% rename from projects/social_platform/src/app/office/projects/detail/detail.routes.ts rename to projects/social_platform/src/app/ui/routes/projects/detail.routes.ts index ad1c499d..b85d75a8 100644 --- a/projects/social_platform/src/app/office/projects/detail/detail.routes.ts +++ b/projects/social_platform/src/app/ui/routes/projects/detail.routes.ts @@ -1,21 +1,21 @@ /** @format */ import { Routes } from "@angular/router"; -import { ProjectInfoComponent } from "./info/info.component"; -import { ProjectInfoResolver } from "./info/info.resolver"; -import { ProjectResponsesResolver } from "./work-section/responses.resolver"; -import { ProjectChatComponent } from "./chat/chat.component"; -import { ProjectChatResolver } from "@office/projects/detail/chat/chat.resolver"; -import { ProjectDetailResolver } from "@office/projects/detail/detail.resolver"; -import { NewsDetailComponent } from "@office/projects/detail/news-detail/news-detail.component"; -import { NewsDetailResolver } from "@office/projects/detail/news-detail/news-detail.resolver"; -import { ProjectTeamComponent } from "./team/team.component"; -import { ProjectVacanciesComponent } from "./vacancies/vacancies.component"; -import { DeatilComponent } from "@office/features/detail/detail.component"; -import { ProjectWorkSectionComponent } from "./work-section/work-section.component"; -import { KanbanBoardResolver } from "./kanban/kanban.resolver"; -import { KanbanBoardGuard } from "./kanban/kanban.guard"; -import { KanbanComponent } from "./kanban/kanban.component"; +import { ProjectInfoComponent } from "../../pages/projects/detail/info/info.component"; +import { ProjectInfoResolver } from "../../pages/projects/detail/info/info.resolver"; +import { ProjectResponsesResolver } from "../../pages/projects/detail/work-section/responses.resolver"; +import { ProjectChatComponent } from "../../pages/projects/detail/chat/chat.component"; +import { ProjectTeamComponent } from "../../pages/projects/detail/team/team.component"; +import { ProjectVacanciesComponent } from "../../pages/projects/detail/vacancies/vacancies.component"; +import { DeatilComponent } from "@ui/components/detail/detail.component"; +import { ProjectWorkSectionComponent } from "../../pages/projects/detail/work-section/work-section.component"; +import { KanbanBoardResolver } from "../../pages/projects/detail/kanban/kanban.resolver"; +import { KanbanBoardGuard } from "../../../../../../core/src/lib/guards/kanban/kanban.guard"; +import { KanbanComponent } from "../../pages/projects/detail/kanban/kanban.component"; +import { ProjectDetailResolver } from "@ui/pages/projects/detail/detail.resolver"; +import { NewsDetailComponent } from "@ui/components/news-detail/news-detail.component"; +import { NewsDetailResolver } from "@ui/components/news-detail/news-detail.resolver"; +import { ProjectChatResolver } from "@ui/pages/projects/detail/chat/chat.resolver"; /** * Конфигурация маршрутов для детального просмотра проекта @@ -74,7 +74,7 @@ export const PROJECT_DETAIL_ROUTES: Routes = [ canActivate: [KanbanBoardGuard], component: KanbanComponent, resolve: { data: KanbanBoardResolver }, - loadChildren: () => import("./kanban/kanban.routes").then(c => c.KANBAN_ROUTES), + loadChildren: () => import("../kanban/kanban.routes").then(c => c.KANBAN_ROUTES), runGuardsAndResolvers: "always", }, { diff --git a/projects/social_platform/src/app/office/projects/projects.routes.ts b/projects/social_platform/src/app/ui/routes/projects/projects.routes.ts similarity index 72% rename from projects/social_platform/src/app/office/projects/projects.routes.ts rename to projects/social_platform/src/app/ui/routes/projects/projects.routes.ts index 2b9196cf..1b9880f0 100644 --- a/projects/social_platform/src/app/office/projects/projects.routes.ts +++ b/projects/social_platform/src/app/ui/routes/projects/projects.routes.ts @@ -1,17 +1,17 @@ /** @format */ import { Routes } from "@angular/router"; -import { ProjectsComponent } from "./projects.component"; -import { ProjectsResolver } from "./projects.resolver"; -import { ProjectsListComponent } from "./list/list.component"; -import { ProjectsMyResolver } from "./list/my.resolver"; -import { ProjectsAllResolver } from "./list/all.resolver"; -import { ProjectEditComponent } from "./edit/edit.component"; -import { ProjectEditResolver } from "./edit/edit.resolver"; -import { ProjectsSubscriptionsResolver } from "./list/subscriptions.resolver"; -import { ProjectEditRequiredGuard } from "./edit/guards/projects-edit.guard"; -import { ProjectsInvitesResolver } from "./list/invites.resolver"; -import { DashboardProjectsComponent } from "./dashboard/dashboard.component"; +import { ProjectsComponent } from "../../pages/projects/projects.component"; +import { ProjectsResolver } from "../../pages/projects/projects.resolver"; +import { ProjectsListComponent } from "../../pages/projects/list/list.component"; +import { ProjectsMyResolver } from "../../pages/projects/list/my.resolver"; +import { ProjectsAllResolver } from "../../pages/projects/list/all.resolver"; +import { ProjectEditComponent } from "../../pages/projects/edit/edit.component"; +import { ProjectEditResolver } from "../../pages/projects/edit/edit.resolver"; +import { ProjectsSubscriptionsResolver } from "../../pages/projects/list/subscriptions.resolver"; +import { ProjectEditRequiredGuard } from "../../../../../../core/src/lib/guards/projects-edit/projects-edit.guard"; +import { ProjectsInvitesResolver } from "../../pages/projects/list/invites.resolver"; +import { DashboardProjectsComponent } from "../../pages/projects/dashboard/dashboard.component"; /** * Конфигурация маршрутов для модуля проектов @@ -96,6 +96,6 @@ export const PROJECTS_ROUTES: Routes = [ }, { path: ":projectId", - loadChildren: () => import("./detail/detail.routes").then(c => c.PROJECT_DETAIL_ROUTES), + loadChildren: () => import("./detail.routes").then(c => c.PROJECT_DETAIL_ROUTES), }, ]; diff --git a/projects/social_platform/src/app/office/vacancies/list/list.routes.ts b/projects/social_platform/src/app/ui/routes/vacancy/list.routes.ts similarity index 88% rename from projects/social_platform/src/app/office/vacancies/list/list.routes.ts rename to projects/social_platform/src/app/ui/routes/vacancy/list.routes.ts index e3e6397c..1d2d172a 100644 --- a/projects/social_platform/src/app/office/vacancies/list/list.routes.ts +++ b/projects/social_platform/src/app/ui/routes/vacancy/list.routes.ts @@ -1,8 +1,8 @@ /** @format */ import { Routes } from "@angular/router"; -import { VacanciesListComponent } from "./list.component"; -import { VacanciesMyResolver } from "./my.resolver"; +import { VacanciesListComponent } from "@ui/pages/vacancies/list/list.component"; +import { VacanciesMyResolver } from "@ui/pages/vacancies/list/my.resolver"; /** * Конфигурация маршрутов для страницы "Мои отклики" diff --git a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.routes.ts b/projects/social_platform/src/app/ui/routes/vacancy/vacancies-detail.routes.ts similarity index 81% rename from projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.routes.ts rename to projects/social_platform/src/app/ui/routes/vacancy/vacancies-detail.routes.ts index f440a13d..fc442763 100644 --- a/projects/social_platform/src/app/office/vacancies/detail/vacancies-detail.routes.ts +++ b/projects/social_platform/src/app/ui/routes/vacancy/vacancies-detail.routes.ts @@ -1,8 +1,8 @@ /** @format */ -import { VacancyInfoComponent } from "./info/info.component"; -import { VacanciesDetailComponent } from "./vacancies-detail.component"; -import { VacanciesDetailResolver } from "./vacancies-detail.resolver"; +import { VacancyInfoComponent } from "../../pages/vacancies/detail/info/info.component"; +import { VacanciesDetailComponent } from "../../pages/vacancies/detail/vacancies-detail.component"; +import { VacanciesDetailResolver } from "../../pages/vacancies/detail/vacancies-detail.resolver"; /** * Конфигурация маршрутов для детального просмотра вакансии diff --git a/projects/social_platform/src/app/office/vacancies/vacancies.routes.ts b/projects/social_platform/src/app/ui/routes/vacancy/vacancies.routes.ts similarity index 76% rename from projects/social_platform/src/app/office/vacancies/vacancies.routes.ts rename to projects/social_platform/src/app/ui/routes/vacancy/vacancies.routes.ts index 912059fd..63c5705f 100644 --- a/projects/social_platform/src/app/office/vacancies/vacancies.routes.ts +++ b/projects/social_platform/src/app/ui/routes/vacancy/vacancies.routes.ts @@ -1,9 +1,9 @@ /** @format */ import { Routes } from "@angular/router"; -import { VacanciesComponent } from "./vacancies.component"; -import { VacanciesResolver } from "./vacancies.resolver"; -import { VacanciesListComponent } from "./list/list.component"; +import { VacanciesListComponent } from "@ui/pages/vacancies/list/list.component"; +import { VacanciesComponent } from "@ui/pages/vacancies/vacancies.component"; +import { VacanciesResolver } from "@ui/pages/vacancies/vacancies.resolver"; /** * Маршруты для модуля вакансий @@ -27,7 +27,7 @@ export const VACANCIES_ROUTES: Routes = [ }, { path: "my", - loadChildren: () => import("./list/list.routes").then(c => c.VACANCY_LIST_ROUTES), + loadChildren: () => import("./list.routes").then(c => c.VACANCY_LIST_ROUTES), }, { path: "all", @@ -40,7 +40,6 @@ export const VACANCIES_ROUTES: Routes = [ }, { path: ":vacancyId", - loadChildren: () => - import("./detail/vacancies-detail.routes").then(c => c.VACANCIES_DETAIL_ROUTES), + loadChildren: () => import("./vacancies-detail.routes").then(c => c.VACANCIES_DETAIL_ROUTES), }, ]; diff --git a/projects/social_platform/src/app/ui/services/animation.service.spec.ts b/projects/social_platform/src/app/ui/services/animation/animation.service.spec.ts similarity index 85% rename from projects/social_platform/src/app/ui/services/animation.service.spec.ts rename to projects/social_platform/src/app/ui/services/animation/animation.service.spec.ts index 4031b669..0d4b95a9 100644 --- a/projects/social_platform/src/app/ui/services/animation.service.spec.ts +++ b/projects/social_platform/src/app/ui/services/animation/animation.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { AnimationService } from "./animation.service"; +import { AnimationService } from "../animation.service"; describe("AnimationService", () => { let service: AnimationService; diff --git a/projects/social_platform/src/app/ui/services/animation.service.ts b/projects/social_platform/src/app/ui/services/animation/animation.service.ts similarity index 100% rename from projects/social_platform/src/app/ui/services/animation.service.ts rename to projects/social_platform/src/app/ui/services/animation/animation.service.ts diff --git a/projects/social_platform/src/app/office/services/loading.service.ts b/projects/social_platform/src/app/ui/services/loading/loading.service.ts similarity index 100% rename from projects/social_platform/src/app/office/services/loading.service.ts rename to projects/social_platform/src/app/ui/services/loading/loading.service.ts diff --git a/projects/social_platform/src/app/office/services/nav.service.spec.ts b/projects/social_platform/src/app/ui/services/nav/nav.service.spec.ts similarity index 87% rename from projects/social_platform/src/app/office/services/nav.service.spec.ts rename to projects/social_platform/src/app/ui/services/nav/nav.service.spec.ts index 5a542c7d..15e3da04 100644 --- a/projects/social_platform/src/app/office/services/nav.service.spec.ts +++ b/projects/social_platform/src/app/ui/services/nav/nav.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { NavService } from "./nav.service"; +import { NavService } from "../nav.service"; describe("NavService", () => { let service: NavService; diff --git a/projects/social_platform/src/app/office/services/nav.service.ts b/projects/social_platform/src/app/ui/services/nav/nav.service.ts similarity index 100% rename from projects/social_platform/src/app/office/services/nav.service.ts rename to projects/social_platform/src/app/ui/services/nav/nav.service.ts diff --git a/projects/social_platform/src/app/office/services/notification.service.spec.ts b/projects/social_platform/src/app/ui/services/notification/notification.service.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/services/notification.service.spec.ts rename to projects/social_platform/src/app/ui/services/notification/notification.service.spec.ts diff --git a/projects/social_platform/src/app/office/services/notification.service.ts b/projects/social_platform/src/app/ui/services/notification/notification.service.ts similarity index 94% rename from projects/social_platform/src/app/office/services/notification.service.ts rename to projects/social_platform/src/app/ui/services/notification/notification.service.ts index f784c7b6..4a4f3c4d 100644 --- a/projects/social_platform/src/app/office/services/notification.service.ts +++ b/projects/social_platform/src/app/ui/services/notification/notification.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { BehaviorSubject, map } from "rxjs"; -import { Notification } from "@models/notification.model"; +import { Notification } from "projects/social_platform/src/app/domain/other/notification.model"; /** * Сервис для управления уведомлениями пользователя diff --git a/projects/social_platform/src/app/ui/services/snackbar.service.spec.ts b/projects/social_platform/src/app/ui/services/snackbar/snackbar.service.spec.ts similarity index 85% rename from projects/social_platform/src/app/ui/services/snackbar.service.spec.ts rename to projects/social_platform/src/app/ui/services/snackbar/snackbar.service.spec.ts index 10b343f8..754ff2d8 100644 --- a/projects/social_platform/src/app/ui/services/snackbar.service.spec.ts +++ b/projects/social_platform/src/app/ui/services/snackbar/snackbar.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; -import { SnackbarService } from "./snackbar.service"; +import { SnackbarService } from "../snackbar.service"; describe("SnackbarService", () => { let service: SnackbarService; diff --git a/projects/social_platform/src/app/ui/services/snackbar.service.ts b/projects/social_platform/src/app/ui/services/snackbar/snackbar.service.ts similarity index 100% rename from projects/social_platform/src/app/ui/services/snackbar.service.ts rename to projects/social_platform/src/app/ui/services/snackbar/snackbar.service.ts diff --git a/projects/social_platform/src/app/office/shared/advert-card/advert-card.component.html b/projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/advert-card/advert-card.component.html rename to projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.html diff --git a/projects/social_platform/src/app/office/shared/advert-card/advert-card.component.scss b/projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/advert-card/advert-card.component.scss rename to projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.scss diff --git a/projects/social_platform/src/app/office/shared/advert-card/advert-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/advert-card/advert-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/advert-card/advert-card.component.ts b/projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.ts similarity index 94% rename from projects/social_platform/src/app/office/shared/advert-card/advert-card.component.ts rename to projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.ts index 205667e0..4b441e46 100644 --- a/projects/social_platform/src/app/office/shared/advert-card/advert-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/advert-card/advert-card.component.ts @@ -1,7 +1,7 @@ /** @format */ import { Component, Input, OnInit } from "@angular/core"; -import { New } from "@models/article.model"; +import { New } from "projects/social_platform/src/app/domain/news/article.model"; /** * Компонент карточки рекламного объявления diff --git a/projects/social_platform/src/app/office/shared/approve-skill-people/approve-skill-people.component.html b/projects/social_platform/src/app/ui/shared/approve-skill-people/approve-skill-people.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/approve-skill-people/approve-skill-people.component.html rename to projects/social_platform/src/app/ui/shared/approve-skill-people/approve-skill-people.component.html diff --git a/projects/social_platform/src/app/office/shared/approve-skill-people/approve-skill-people.component.scss b/projects/social_platform/src/app/ui/shared/approve-skill-people/approve-skill-people.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/approve-skill-people/approve-skill-people.component.scss rename to projects/social_platform/src/app/ui/shared/approve-skill-people/approve-skill-people.component.scss diff --git a/projects/social_platform/src/app/office/shared/approve-skill-people/approve-skill-people.component.ts b/projects/social_platform/src/app/ui/shared/approve-skill-people/approve-skill-people.component.ts similarity index 91% rename from projects/social_platform/src/app/office/shared/approve-skill-people/approve-skill-people.component.ts rename to projects/social_platform/src/app/ui/shared/approve-skill-people/approve-skill-people.component.ts index cf3d051d..d827f000 100644 --- a/projects/social_platform/src/app/office/shared/approve-skill-people/approve-skill-people.component.ts +++ b/projects/social_platform/src/app/ui/shared/approve-skill-people/approve-skill-people.component.ts @@ -3,8 +3,8 @@ import { CommonModule } from "@angular/common"; import { Component, Input } from "@angular/core"; import { PluralizePipe } from "@corelib"; -import { Skill } from "@office/models/skill"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { Skill } from "../../../domain/skills/skill"; @Component({ selector: "app-approve-skill-people", diff --git a/projects/social_platform/src/app/office/shared/carousel/carousel.component.html b/projects/social_platform/src/app/ui/shared/carousel/carousel.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/carousel/carousel.component.html rename to projects/social_platform/src/app/ui/shared/carousel/carousel.component.html diff --git a/projects/social_platform/src/app/office/shared/carousel/carousel.component.scss b/projects/social_platform/src/app/ui/shared/carousel/carousel.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/carousel/carousel.component.scss rename to projects/social_platform/src/app/ui/shared/carousel/carousel.component.scss diff --git a/projects/social_platform/src/app/office/shared/carousel/carousel.component.spec.ts b/projects/social_platform/src/app/ui/shared/carousel/carousel.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/carousel/carousel.component.spec.ts rename to projects/social_platform/src/app/ui/shared/carousel/carousel.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/carousel/carousel.component.ts b/projects/social_platform/src/app/ui/shared/carousel/carousel.component.ts similarity index 97% rename from projects/social_platform/src/app/office/shared/carousel/carousel.component.ts rename to projects/social_platform/src/app/ui/shared/carousel/carousel.component.ts index 47e780f7..878ef606 100644 --- a/projects/social_platform/src/app/office/shared/carousel/carousel.component.ts +++ b/projects/social_platform/src/app/ui/shared/carousel/carousel.component.ts @@ -1,7 +1,7 @@ /** @format */ import { Component, EventEmitter, Input, type OnInit, Output } from "@angular/core"; -import { FileModel } from "@office/models/file.model"; +import { FileModel } from "projects/social_platform/src/app/domain/file/file.model"; import { IconComponent } from "@uilib"; /** diff --git a/projects/social_platform/src/app/office/chat/shared/chat-card/chat-card.component.html b/projects/social_platform/src/app/ui/shared/chat-card/chat-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/chat/shared/chat-card/chat-card.component.html rename to projects/social_platform/src/app/ui/shared/chat-card/chat-card.component.html diff --git a/projects/social_platform/src/app/office/chat/shared/chat-card/chat-card.component.scss b/projects/social_platform/src/app/ui/shared/chat-card/chat-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/chat/shared/chat-card/chat-card.component.scss rename to projects/social_platform/src/app/ui/shared/chat-card/chat-card.component.scss diff --git a/projects/social_platform/src/app/office/chat/shared/chat-card/chat-card.component.ts b/projects/social_platform/src/app/ui/shared/chat-card/chat-card.component.ts similarity index 94% rename from projects/social_platform/src/app/office/chat/shared/chat-card/chat-card.component.ts rename to projects/social_platform/src/app/ui/shared/chat-card/chat-card.component.ts index 8295a0ec..523580ac 100644 --- a/projects/social_platform/src/app/office/chat/shared/chat-card/chat-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/chat-card/chat-card.component.ts @@ -1,12 +1,12 @@ /** @format */ import { Component, Input, OnInit } from "@angular/core"; -import { ChatListItem } from "@office/chat/models/chat-item.model"; -import { AuthService } from "@auth/services"; import { map } from "rxjs"; import { DayjsPipe } from "projects/core"; import { AsyncPipe } from "@angular/common"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; +import { AuthService } from "../../../api/auth"; +import { ChatListItem } from "../../../domain/chat/chat-item.model"; /** * Компонент карточки чата для отображения в списке чатов diff --git a/projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.html b/projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.html similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.html rename to projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.html diff --git a/projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.scss b/projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.scss similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.scss rename to projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.scss diff --git a/projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.spec.ts b/projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.spec.ts rename to projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.spec.ts diff --git a/projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.ts b/projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.ts similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/closed-vacancy/closed-vacancy.component.ts rename to projects/social_platform/src/app/ui/shared/closed-vacancy/closed-vacancy.component.ts diff --git a/projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.html b/projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.html rename to projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.html diff --git a/projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.scss b/projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.scss rename to projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.scss diff --git a/projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.ts b/projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.ts similarity index 85% rename from projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.ts rename to projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.ts index cdd3e741..22ddbe2a 100644 --- a/projects/social_platform/src/app/office/shared/collaborator-card/collaborator-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/collaborator-card/collaborator-card.component.ts @@ -4,12 +4,12 @@ import { CommonModule } from "@angular/common"; import { Component, EventEmitter, inject, Input, OnInit, Output } from "@angular/core"; import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { ErrorMessage } from "@error/models/error-message"; -import { Collaborator } from "@office/models/collaborator.model"; -import { ProjectService } from "@office/services/project.service"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { IconComponent } from "@uilib"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; /** * Компонент карточки участника команды или проект diff --git a/projects/social_platform/src/app/office/projects/dashboard/shared/dashboardItem/dashboardItem.component.html b/projects/social_platform/src/app/ui/shared/dashboardItem/dashboardItem.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/dashboard/shared/dashboardItem/dashboardItem.component.html rename to projects/social_platform/src/app/ui/shared/dashboardItem/dashboardItem.component.html diff --git a/projects/social_platform/src/app/office/projects/dashboard/shared/dashboardItem/dashboardItem.component.scss b/projects/social_platform/src/app/ui/shared/dashboardItem/dashboardItem.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/dashboard/shared/dashboardItem/dashboardItem.component.scss rename to projects/social_platform/src/app/ui/shared/dashboardItem/dashboardItem.component.scss diff --git a/projects/social_platform/src/app/office/projects/dashboard/shared/dashboardItem/dashboardItem.component.ts b/projects/social_platform/src/app/ui/shared/dashboardItem/dashboardItem.component.ts similarity index 83% rename from projects/social_platform/src/app/office/projects/dashboard/shared/dashboardItem/dashboardItem.component.ts rename to projects/social_platform/src/app/ui/shared/dashboardItem/dashboardItem.component.ts index 074d1567..6c001b88 100644 --- a/projects/social_platform/src/app/office/projects/dashboard/shared/dashboardItem/dashboardItem.component.ts +++ b/projects/social_platform/src/app/ui/shared/dashboardItem/dashboardItem.component.ts @@ -2,11 +2,11 @@ import { CommonModule } from "@angular/common"; import { Component, inject, Input, OnInit } from "@angular/core"; -import { Project } from "@office/models/project.model"; import { IconComponent } from "@uilib"; -import { ProjectsService } from "@office/projects/services/projects.service"; import { RouterLink } from "@angular/router"; -import { InfoCardComponent } from "@office/features/info-card/info-card.component"; +import { InfoCardComponent } from "@ui/components/info-card/info-card.component"; +import { Project } from "../../../domain/project/project.model"; +import { ProjectsService } from "../../../api/project/projects.service"; @Component({ selector: "app-dashboard-item", diff --git a/projects/social_platform/src/app/office/shared/header/header.component.html b/projects/social_platform/src/app/ui/shared/header/header.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/header/header.component.html rename to projects/social_platform/src/app/ui/shared/header/header.component.html diff --git a/projects/social_platform/src/app/office/shared/header/header.component.scss b/projects/social_platform/src/app/ui/shared/header/header.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/header/header.component.scss rename to projects/social_platform/src/app/ui/shared/header/header.component.scss diff --git a/projects/social_platform/src/app/office/shared/header/header.component.spec.ts b/projects/social_platform/src/app/ui/shared/header/header.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/header/header.component.spec.ts rename to projects/social_platform/src/app/ui/shared/header/header.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/header/header.component.ts b/projects/social_platform/src/app/ui/shared/header/header.component.ts similarity index 93% rename from projects/social_platform/src/app/office/shared/header/header.component.ts rename to projects/social_platform/src/app/ui/shared/header/header.component.ts index 8f07acc2..fb007e95 100644 --- a/projects/social_platform/src/app/office/shared/header/header.component.ts +++ b/projects/social_platform/src/app/ui/shared/header/header.component.ts @@ -1,15 +1,15 @@ /** @format */ import { Component, Input, OnInit } from "@angular/core"; -import { NotificationService } from "@services/notification.service"; -import { AuthService } from "@auth/services"; -import { Invite } from "@models/invite.model"; -import { InviteService } from "@services/invite.service"; +import { NotificationService } from "@ui/services/notification.service"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; import { Router } from "@angular/router"; import { IconComponent } from "@ui/components"; import { AsyncPipe } from "@angular/common"; import { ClickOutsideModule } from "ng-click-outside"; import { InviteManageCardComponent, ProfileInfoComponent } from "@uilib"; +import { AuthService } from "../../../api/auth"; /** * Компонент заголовка приложения diff --git a/projects/social_platform/src/app/office/shared/img-card/img-card.component.html b/projects/social_platform/src/app/ui/shared/img-card/img-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/img-card/img-card.component.html rename to projects/social_platform/src/app/ui/shared/img-card/img-card.component.html diff --git a/projects/social_platform/src/app/office/shared/img-card/img-card.component.scss b/projects/social_platform/src/app/ui/shared/img-card/img-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/img-card/img-card.component.scss rename to projects/social_platform/src/app/ui/shared/img-card/img-card.component.scss diff --git a/projects/social_platform/src/app/office/shared/img-card/img-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/img-card/img-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/img-card/img-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/img-card/img-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/img-card/img-card.component.ts b/projects/social_platform/src/app/ui/shared/img-card/img-card.component.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/img-card/img-card.component.ts rename to projects/social_platform/src/app/ui/shared/img-card/img-card.component.ts diff --git a/projects/social_platform/src/app/office/shared/link-card/link-card.component.html b/projects/social_platform/src/app/ui/shared/link-card/link-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/link-card/link-card.component.html rename to projects/social_platform/src/app/ui/shared/link-card/link-card.component.html diff --git a/projects/social_platform/src/app/office/shared/link-card/link-card.component.scss b/projects/social_platform/src/app/ui/shared/link-card/link-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/link-card/link-card.component.scss rename to projects/social_platform/src/app/ui/shared/link-card/link-card.component.scss diff --git a/projects/social_platform/src/app/office/shared/link-card/link-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/link-card/link-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/link-card/link-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/link-card/link-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/link-card/link-card.component.ts b/projects/social_platform/src/app/ui/shared/link-card/link-card.component.ts similarity index 96% rename from projects/social_platform/src/app/office/shared/link-card/link-card.component.ts rename to projects/social_platform/src/app/ui/shared/link-card/link-card.component.ts index 7418a4c4..d55fa1d0 100644 --- a/projects/social_platform/src/app/office/shared/link-card/link-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/link-card/link-card.component.ts @@ -3,7 +3,7 @@ import { UpperCasePipe } from "@angular/common"; import { Component, EventEmitter, Input, Output } from "@angular/core"; import { IconComponent } from "@ui/components"; -import { LinkTransformPipe } from "projects/core/src/lib/pipes/link-transform.pipe"; +import { LinkTransformPipe } from "projects/core/src/lib/pipes/transformers/link-transform.pipe"; /** * Компонент карточки ссылки или достижения diff --git a/projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.html b/projects/social_platform/src/app/ui/shared/new-project/new-project.component.html similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.html rename to projects/social_platform/src/app/ui/shared/new-project/new-project.component.html diff --git a/projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.scss b/projects/social_platform/src/app/ui/shared/new-project/new-project.component.scss similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.scss rename to projects/social_platform/src/app/ui/shared/new-project/new-project.component.scss diff --git a/projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.ts b/projects/social_platform/src/app/ui/shared/new-project/new-project.component.ts similarity index 90% rename from projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.ts rename to projects/social_platform/src/app/ui/shared/new-project/new-project.component.ts index f426eb8c..edcfd773 100644 --- a/projects/social_platform/src/app/office/feed/shared/new-project/new-project.component.ts +++ b/projects/social_platform/src/app/ui/shared/new-project/new-project.component.ts @@ -5,11 +5,11 @@ import { CommonModule } from "@angular/common"; import { ButtonComponent, IconComponent } from "@ui/components"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { Router, RouterLink } from "@angular/router"; -import { FeedProject } from "@office/feed/models/feed-item.model"; import { DayjsPipe } from "@corelib"; -import { IndustryService } from "@office/services/industry.service"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; import { TagComponent } from "@ui/components/tag/tag.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { FeedProject } from "../../../domain/feed/feed-item.model"; /** * КОМПОНЕНТ НОВОГО ПРОЕКТА diff --git a/projects/social_platform/src/app/office/feed/shared/open-vacancy/open-vacancy.component.html b/projects/social_platform/src/app/ui/shared/open-vacancy/open-vacancy.component.html similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/open-vacancy/open-vacancy.component.html rename to projects/social_platform/src/app/ui/shared/open-vacancy/open-vacancy.component.html diff --git a/projects/social_platform/src/app/office/feed/shared/open-vacancy/open-vacancy.component.scss b/projects/social_platform/src/app/ui/shared/open-vacancy/open-vacancy.component.scss similarity index 100% rename from projects/social_platform/src/app/office/feed/shared/open-vacancy/open-vacancy.component.scss rename to projects/social_platform/src/app/ui/shared/open-vacancy/open-vacancy.component.scss diff --git a/projects/social_platform/src/app/office/feed/shared/open-vacancy/open-vacancy.component.ts b/projects/social_platform/src/app/ui/shared/open-vacancy/open-vacancy.component.ts similarity index 93% rename from projects/social_platform/src/app/office/feed/shared/open-vacancy/open-vacancy.component.ts rename to projects/social_platform/src/app/ui/shared/open-vacancy/open-vacancy.component.ts index 333b5f63..04edf801 100644 --- a/projects/social_platform/src/app/office/feed/shared/open-vacancy/open-vacancy.component.ts +++ b/projects/social_platform/src/app/ui/shared/open-vacancy/open-vacancy.component.ts @@ -13,12 +13,12 @@ import { ButtonComponent } from "@ui/components"; import { DayjsPipe, ParseBreaksPipe, ParseLinksPipe } from "projects/core"; import { Router, RouterLink } from "@angular/router"; import { TagComponent } from "@ui/components/tag/tag.component"; -import { Vacancy } from "@models/vacancy.model"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; import { expandElement } from "@utils/expand-element"; -import { IndustryService } from "@office/services/industry.service"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { AdvertCardComponent } from "@office/shared/advert-card/advert-card.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { AdvertCardComponent } from "@ui/shared/advert-card/advert-card.component"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; /** * diff --git a/projects/social_platform/src/app/office/profile/profile-news/profile-news.component.html b/projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.html similarity index 100% rename from projects/social_platform/src/app/office/profile/profile-news/profile-news.component.html rename to projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.html diff --git a/projects/social_platform/src/app/office/profile/profile-news/profile-news.component.scss b/projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.scss similarity index 100% rename from projects/social_platform/src/app/office/profile/profile-news/profile-news.component.scss rename to projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.scss diff --git a/projects/social_platform/src/app/office/profile/profile-news/profile-news.component.spec.ts b/projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/profile/profile-news/profile-news.component.spec.ts rename to projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.spec.ts diff --git a/projects/social_platform/src/app/office/profile/profile-news/profile-news.component.ts b/projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.ts similarity index 94% rename from projects/social_platform/src/app/office/profile/profile-news/profile-news.component.ts rename to projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.ts index d6db6a92..c6355549 100644 --- a/projects/social_platform/src/app/office/profile/profile-news/profile-news.component.ts +++ b/projects/social_platform/src/app/ui/shared/profile-news/profile-news.component.ts @@ -3,11 +3,11 @@ import { CommonModule } from "@angular/common"; import { Component, inject, OnDestroy, OnInit, signal } from "@angular/core"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { ProfileNewsService } from "../detail/services/profile-news.service"; +import { ProfileNewsService } from "../../../api/profile/profile-news.service"; import { map, Subscription } from "rxjs"; import { ActivatedRoute, Router } from "@angular/router"; -import { FeedNews } from "@office/projects/models/project-news.model"; -import { NewsCardComponent } from "@office/features/news-card/news-card.component"; +import { NewsCardComponent } from "@ui/components/news-card/news-card.component"; +import { FeedNews } from "../../../domain/project/project-news.model"; /** * Компонент для отображения отдельной новости профиля в модальном окне @@ -72,6 +72,8 @@ export class ProfileNewsComponent implements OnInit, OnDestroy { }, }); + console.log(this.newsItem()); + this.subscriptions$.push(profileNewsSub$); } diff --git a/projects/social_platform/src/app/office/program/shared/program-card/program-card.component.html b/projects/social_platform/src/app/ui/shared/program-card/program-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/program/shared/program-card/program-card.component.html rename to projects/social_platform/src/app/ui/shared/program-card/program-card.component.html diff --git a/projects/social_platform/src/app/office/program/shared/program-card/program-card.component.scss b/projects/social_platform/src/app/ui/shared/program-card/program-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/shared/program-card/program-card.component.scss rename to projects/social_platform/src/app/ui/shared/program-card/program-card.component.scss diff --git a/projects/social_platform/src/app/office/program/shared/program-card/program-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/program-card/program-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/shared/program-card/program-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/program-card/program-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/program/shared/program-card/program-card.component.ts b/projects/social_platform/src/app/ui/shared/program-card/program-card.component.ts similarity index 96% rename from projects/social_platform/src/app/office/program/shared/program-card/program-card.component.ts rename to projects/social_platform/src/app/ui/shared/program-card/program-card.component.ts index 41aa9fd8..8ccd5fd1 100644 --- a/projects/social_platform/src/app/office/program/shared/program-card/program-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/program-card/program-card.component.ts @@ -1,10 +1,10 @@ /** @format */ import { Component, Input, OnInit } from "@angular/core"; -import { Program } from "@office/program/models/program.model"; import { IconComponent } from "@ui/components"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { DatePipe, NgClass } from "@angular/common"; +import { Program } from "../../../domain/program/program.model"; /** * Компонент карточки программы diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-direction-card/project-direction-card.component.html b/projects/social_platform/src/app/ui/shared/project-direction-card/project-direction-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-direction-card/project-direction-card.component.html rename to projects/social_platform/src/app/ui/shared/project-direction-card/project-direction-card.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-direction-card/project-direction-card.component.scss b/projects/social_platform/src/app/ui/shared/project-direction-card/project-direction-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-direction-card/project-direction-card.component.scss rename to projects/social_platform/src/app/ui/shared/project-direction-card/project-direction-card.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-direction-card/project-direction-card.component.ts b/projects/social_platform/src/app/ui/shared/project-direction-card/project-direction-card.component.ts similarity index 92% rename from projects/social_platform/src/app/office/projects/detail/shared/project-direction-card/project-direction-card.component.ts rename to projects/social_platform/src/app/ui/shared/project-direction-card/project-direction-card.component.ts index 5bf550fa..efa14a79 100644 --- a/projects/social_platform/src/app/office/projects/detail/shared/project-direction-card/project-direction-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/project-direction-card/project-direction-card.component.ts @@ -6,18 +6,18 @@ import { ModalComponent } from "@ui/components/modal/modal.component"; import { IconComponent } from "@uilib"; import { TagComponent } from "@ui/components/tag/tag.component"; import { ActivatedRoute, Router } from "@angular/router"; -import { ProfileService } from "@auth/services/profile.service"; import { map, Subscription, switchMap } from "rxjs"; -import { Achievement } from "@auth/models/user.model"; +import { Achievement } from "projects/social_platform/src/app/domain/auth/user.model"; import { FileItemComponent } from "@ui/components/file-item/file-item.component"; -import { FileModel } from "@office/models/file.model"; +import { FileModel } from "projects/social_platform/src/app/domain/file/file.model"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { DayjsPipe } from "@corelib"; import { ButtonComponent } from "@ui/components"; -import { ProjectService } from "@office/services/project.service"; -import { Goal } from "@office/models/goals.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; import { EditorSubmitButtonDirective } from "@ui/directives/editor-submit-button.directive"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; +import { Goal } from "../../../domain/project/goals.model"; +import { ProfileService } from "../../../api/auth/profile.service"; @Component({ selector: "app-project-direction-card", templateUrl: "./project-direction-card.component.html", diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.html b/projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.html rename to projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.scss b/projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.scss rename to projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.ts b/projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.ts similarity index 97% rename from projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.ts rename to projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.ts index 72ddffdd..6d4ad809 100644 --- a/projects/social_platform/src/app/office/projects/detail/shared/project-member-card/project-member-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/project-member-card/project-member-card.component.ts @@ -4,7 +4,7 @@ import { CdkMenu, CdkMenuItem, CdkMenuTrigger } from "@angular/cdk/menu"; import { CommonModule } from "@angular/common"; import { Component, EventEmitter, Input, Output } from "@angular/core"; import { RouterLink } from "@angular/router"; -import { Collaborator } from "@office/models/collaborator.model"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; import { AvatarComponent, IconComponent } from "@uilib"; /** diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.html b/projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.html rename to projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.html diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.scss b/projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.scss rename to projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.scss diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts b/projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.ts similarity index 94% rename from projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts rename to projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.ts index 94f6c800..49ceedbb 100644 --- a/projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/project-vacancy-card/project-vacancy-card.component.ts @@ -11,14 +11,14 @@ import { ViewChild, } from "@angular/core"; import { RouterLink } from "@angular/router"; -import { Vacancy } from "@office/models/vacancy.model"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; import { IconComponent } from "@uilib"; import { ButtonComponent } from "@ui/components"; import { DayjsPipe, ParseBreaksPipe, ParseLinksPipe } from "@corelib"; import { expandElement } from "@utils/expand-element"; import { TagComponent } from "@ui/components/tag/tag.component"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; /** * КОМПОНЕНТ КАРТОЧКИ ВАКАНСИИ ПРОЕКТА diff --git a/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.html b/projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.html rename to projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.html diff --git a/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.scss b/projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.scss rename to projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.scss diff --git a/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts b/projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.ts similarity index 96% rename from projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts rename to projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.ts index dd158bd7..2bd983d2 100644 --- a/projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts +++ b/projects/social_platform/src/app/ui/shared/rating-card/rating-card.component.ts @@ -14,7 +14,6 @@ import { import { ButtonComponent, IconComponent } from "@ui/components"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; import { CommonModule } from "@angular/common"; -import { ProjectRate } from "@office/program/models/project-rate"; import { ControlErrorPipe, ParseBreaksPipe, ParseLinksPipe } from "projects/core"; import { expandElement } from "@utils/expand-element"; import { @@ -28,17 +27,18 @@ import { tap, } from "rxjs"; import { BreakpointObserver } from "@angular/cdk/layout"; -import { IndustryService } from "@office/services/industry.service"; -import { ProjectRatingComponent } from "@office/features/project-rating/project-rating.component"; +import { IndustryService } from "projects/social_platform/src/app/api/industry/industry.service"; +import { ProjectRatingComponent } from "@ui/components/project-rating/project-rating.component"; import { FormControl, ReactiveFormsModule } from "@angular/forms"; -import { ProjectRatingService } from "@office/program/services/project-rating.service"; import { RouterLink } from "@angular/router"; import { TagComponent } from "@ui/components/tag/tag.component"; import { ModalComponent } from "@ui/components/modal/modal.component"; -import { ProgramDataService } from "@office/program/services/program-data.service"; -import { AuthService } from "@auth/services"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; import { HttpResponse } from "@angular/common/http"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { ProjectRatingService } from "../../../api/project/project-rating.service"; +import { ProgramDataService } from "../../../api/program/program-data.service"; +import { ProjectRate } from "../../../domain/project/project-rate"; /** * Компонент карточки оценки проекта diff --git a/projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.html b/projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.html rename to projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.html diff --git a/projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.scss b/projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.scss rename to projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.scss diff --git a/projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.spec.ts b/projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.spec.ts rename to projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.ts b/projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.ts similarity index 98% rename from projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.ts rename to projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.ts index 564c2b69..d210a50a 100644 --- a/projects/social_platform/src/app/office/shared/skills-basket/skills-basket.component.ts +++ b/projects/social_platform/src/app/ui/shared/skills-basket/skills-basket.component.ts @@ -2,10 +2,10 @@ import { CommonModule } from "@angular/common"; import { Component, forwardRef, Input, signal } from "@angular/core"; -import { Skill } from "@office/models/skill"; import { IconComponent } from "@ui/components"; import { NG_VALUE_ACCESSOR } from "@angular/forms"; import { noop } from "rxjs"; +import { Skill } from "../../../domain/skills/skill"; /** * Компонент корзины навыков diff --git a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.html b/projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/skills-group/skills-group.component.html rename to projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.html diff --git a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss b/projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/skills-group/skills-group.component.scss rename to projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.scss diff --git a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.spec.ts b/projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/skills-group/skills-group.component.spec.ts rename to projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.ts b/projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.ts similarity index 98% rename from projects/social_platform/src/app/office/shared/skills-group/skills-group.component.ts rename to projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.ts index cce0b02b..e1be17b4 100644 --- a/projects/social_platform/src/app/office/shared/skills-group/skills-group.component.ts +++ b/projects/social_platform/src/app/ui/shared/skills-group/skills-group.component.ts @@ -9,7 +9,7 @@ import { signal, } from "@angular/core"; import { IconComponent } from "@ui/components"; -import { Skill } from "@office/models/skill"; +import { Skill } from "../../../domain/skills/skill"; /** * Компонент группы навыков с возможностью множественного выбора diff --git a/projects/social_platform/src/app/office/shared/soon-card/soon-card.component.html b/projects/social_platform/src/app/ui/shared/soon-card/soon-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/soon-card/soon-card.component.html rename to projects/social_platform/src/app/ui/shared/soon-card/soon-card.component.html diff --git a/projects/social_platform/src/app/office/shared/soon-card/soon-card.component.scss b/projects/social_platform/src/app/ui/shared/soon-card/soon-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/soon-card/soon-card.component.scss rename to projects/social_platform/src/app/ui/shared/soon-card/soon-card.component.scss diff --git a/projects/social_platform/src/app/office/shared/soon-card/soon-card.component.ts b/projects/social_platform/src/app/ui/shared/soon-card/soon-card.component.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/soon-card/soon-card.component.ts rename to projects/social_platform/src/app/ui/shared/soon-card/soon-card.component.ts diff --git a/projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.html b/projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.html similarity index 100% rename from projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.html rename to projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.html diff --git a/projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.scss b/projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.scss similarity index 100% rename from projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.scss rename to projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.scss diff --git a/projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.spec.ts b/projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.spec.ts rename to projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.spec.ts diff --git a/projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.ts b/projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.ts similarity index 96% rename from projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.ts rename to projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.ts index 70bb7cb3..ed639697 100644 --- a/projects/social_platform/src/app/office/shared/specializations-group/specializations-group.component.ts +++ b/projects/social_platform/src/app/ui/shared/specializations-group/specializations-group.component.ts @@ -10,7 +10,7 @@ import { signal, } from "@angular/core"; import { IconComponent } from "@ui/components"; -import { Specialization } from "@office/models/specialization"; +import { Specialization } from "projects/social_platform/src/app/domain/specializations/specialization"; /** * Компонент группы специализаций с возможностью сворачивания/разворачивания diff --git a/projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.html b/projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.html similarity index 100% rename from projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.html rename to projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.html diff --git a/projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.scss b/projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.scss similarity index 100% rename from projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.scss rename to projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.scss diff --git a/projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.spec.ts b/projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.spec.ts similarity index 100% rename from projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.spec.ts rename to projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.spec.ts diff --git a/projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.ts b/projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.ts similarity index 100% rename from projects/social_platform/src/app/office/onboarding/user-type-card/user-type-card.component.ts rename to projects/social_platform/src/app/ui/shared/user-type-card/user-type-card.component.ts diff --git a/projects/social_platform/src/app/utils/calculateProgress.ts b/projects/social_platform/src/app/utils/calculateProgress.ts index 830c8d26..14ad5ee1 100644 --- a/projects/social_platform/src/app/utils/calculateProgress.ts +++ b/projects/social_platform/src/app/utils/calculateProgress.ts @@ -1,6 +1,6 @@ /** @format */ -import { User } from "@auth/models/user.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; import { profileFields } from "projects/core/src/consts/other/profile-fields.const"; /** diff --git a/projects/social_platform/src/app/utils/helpers/dashboardItemBuilder.ts b/projects/social_platform/src/app/utils/helpers/dashboardItemBuilder.ts index 45754f78..ed4528ce 100644 --- a/projects/social_platform/src/app/utils/helpers/dashboardItemBuilder.ts +++ b/projects/social_platform/src/app/utils/helpers/dashboardItemBuilder.ts @@ -1,6 +1,6 @@ /** @format */ -import { Project } from "@office/models/project.model"; +import { Project } from "../../domain/project/project.model"; export interface DashboardItem { sectionName: string; diff --git a/projects/social_platform/src/app/utils/helpers/inviteToProjectMapper.ts b/projects/social_platform/src/app/utils/helpers/inviteToProjectMapper.ts index 94c55eb6..ba9615c6 100644 --- a/projects/social_platform/src/app/utils/helpers/inviteToProjectMapper.ts +++ b/projects/social_platform/src/app/utils/helpers/inviteToProjectMapper.ts @@ -1,6 +1,6 @@ /** @format */ -import { Invite } from "@office/models/invite.model"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; export const inviteToProjectMapper = (invites: Invite[] = []): any[] => { return (invites ?? []).map((invite: Invite) => ({ diff --git a/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.ts b/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.ts index c6487b6f..1c9aceba 100644 --- a/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.ts +++ b/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.ts @@ -1,12 +1,12 @@ /** @format */ import { Component, EventEmitter, Input, type OnInit, Output } from "@angular/core"; -import type { Invite } from "@models/invite.model"; +import type { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; import { DayjsPipe } from "projects/core"; import { ButtonComponent } from "@ui/components"; import { RouterLink } from "@angular/router"; import { AvatarComponent } from "@ui/components/avatar/avatar.component"; -import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe"; +import { TruncatePipe } from "projects/core/src/lib/pipes/formatters/truncate.pipe"; /** * Компонент карточки управления приглашением diff --git a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts index 86cdcd27..78e83c4c 100644 --- a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts +++ b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts @@ -4,7 +4,7 @@ import { CommonModule } from "@angular/common"; import { ChangeDetectionStrategy, Component, Input, Output, EventEmitter } from "@angular/core"; import { InviteManageCardComponent, ProfileInfoComponent, IconComponent } from "@uilib"; import { ClickOutsideModule } from "ng-click-outside"; -import type { Invite } from "@office/models/invite.model"; +import type { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; import { RouterLink } from "@angular/router"; import type { User } from "../../../models/user.model"; From d2ee4ca5666d5b9b4acb97243bfb46dbb723b9d4 Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 20 Jan 2026 13:09:48 +0300 Subject: [PATCH 21/22] add facades for components & ui facades --- .../guards/profile-edit/profile-edit.guard.ts | 28 + .../api/auth/facades/auth-email.service.ts | 80 +++ .../api/auth/facades/auth-login.service.ts | 62 +++ .../api/auth/facades/auth-password.service.ts | 82 +++ .../api/auth/facades/auth-register.service.ts | 67 +++ .../auth/facades/ui/auth-ui-info.service.ts | 143 +++++ .../chat/facedes/chat-direct-info.service.ts | 273 +++++++++ .../app/api/chat/facedes/chat-info.service.ts | 84 +++ .../facedes/ui/chat-direct-ui-info.service.ts | 99 ++++ .../chat/facedes/ui/chat-ui-info.service.ts | 19 + .../src/app/api/expand/expand.service.ts | 50 ++ .../app/api/feed/facades/feed-info.service.ts | 230 ++++++++ .../feed/facades/ui/feed-ui-info.service.ts | 44 ++ .../member/facades/members-info.service.ts | 228 ++++++++ .../facades/ui/members-ui-info.service.ts | 53 ++ .../src/app/api/news/news-info.service.ts | 51 ++ .../api/office/facades/office-info.service.ts | 145 +++++ .../facades/ui/office-ui-info.service.ts | 60 ++ .../facades/onboarding-info.service.ts | 61 ++ .../onboarding-stage-one-info.service.ts | 97 ++++ .../onboarding-stage-three-info.service.ts | 57 ++ .../onboarding-stage-two-info.service.ts | 114 ++++ .../onboarding-stage-zero-info.service.ts | 121 ++++ .../onboarding-stage-one-ui-info.service.ts | 51 ++ .../onboarding-stage-three-ui-info.service.ts | 21 + .../onboarding-stage-two-ui-info.service.ts | 61 ++ .../onboarding-stage-zero-ui-info.service.ts | 517 +++++++++++++++++ .../stages/ui/onboarding-ui-info.service.ts | 10 + .../src/app/api/paths/navigation.service.ts | 17 + .../src/app/api/paths/paths.service.ts | 23 + .../detail/profile-detail-info.service.ts | 185 ++++++ .../profile-detail-projects-info.service.ts | 39 ++ .../ui/profile-detail-ui-info.service.ts | 55 ++ .../profile-edit-achievements-info.service.ts | 142 +++++ .../profile-edit-education-info.service.ts | 185 ++++++ .../profile-edit-experience-info.service.ts | 160 ++++++ .../facades/edit/profile-edit-info.service.ts | 158 ++++++ .../edit/profile-edit-skills-info.service.ts | 130 +++++ .../facades/edit/profile-form.service.ts | 369 ++++++++++++ .../program-detail-list-info.service.ts | 357 ++++++++++++ .../program-detail-main-info.service.ts | 231 ++++++++ .../ui/program-detail-list-ui-info.service.ts | 86 +++ .../ui/program-detail-main-ui-info.service.ts | 56 ++ .../program/facades/program-info.service.ts | 42 ++ .../facades/program-main-info.service.ts | 91 +++ .../ui/program-main-ui-info.service.ts | 25 + .../api/project/dto/create-vacancy.model.ts | 12 + .../projects-dashboard-info.service.ts | 42 ++ .../ui/projects-dashboard-ui-info.service.ts | 46 ++ .../chat/projects-detail-chat.service.ts | 14 + .../facades/detail/projects-detail.service.ts | 214 +++++++ .../detail/ui/projects-detail-ui.service.ts | 77 +++ ...ojects-detail-work-section-info.service.ts | 67 +++ ...cts-detail-work-section-ui-info.service.ts | 19 + .../edit/project-achievements.service.ts | 163 ++++++ .../edit/project-additional.service.ts | 221 ++++++++ .../facades/edit/project-contacts.service.ts | 136 +++++ .../facades/edit/project-form.service.ts | 370 ++++++++++++ .../facades/edit/project-goals.service.ts | 301 ++++++++++ .../facades/edit/project-partner.service.ts | 279 ++++++++++ .../facades/edit/project-resources.service.ts | 291 ++++++++++ .../facades/edit/project-team.service.ts | 106 ++++ .../facades/edit/project-vacancy.service.ts | 119 ++++ .../edit/projects-edit-info.service.ts | 525 ++++++++++++++++++ .../edit/ui/project-goals-ui.service.ts | 75 +++ .../edit/ui/project-team-ui.service.ts | 148 +++++ .../edit/ui/project-vacancy-ui.service.ts | 197 +++++++ .../edit/ui/projects-edit-ui-info.service.ts | 58 ++ .../list/projects-list-info.service.ts | 218 ++++++++ .../project/facades/projects-info.service.ts | 91 +++ .../facades/ui/projects-ui-info.service.ts | 28 + .../src/app/api/searches/searches.service.ts | 33 ++ .../api/skills/facades/skills-info.service.ts | 67 +++ .../src/app/api/swipe/swipe.service.ts | 51 ++ .../app/api/tooltip/tooltip-info.service.ts | 134 +++++ .../ui/vacancy-detail-ui-info.service.ts | 47 ++ .../facades/ui/vacancy-ui-info.service.ts | 107 ++++ .../facades/vacancy-detail-info.service.ts | 93 ++++ .../vacancy/facades/vacancy-info.service.ts | 227 ++++++++ .../src/app/domain/auth/register.model.ts | 10 + .../services/approve-skill-info.service.ts | 97 ++++ .../services/approve-skill-ui-info.service.ts | 20 + .../detail/services/detail-info.service.ts | 25 + .../project/detail-project-info.service.ts | 6 + .../project-navigation.component.html | 25 + .../project-navigation.component.scss | 81 +++ .../project-navigation.component.ts | 26 + .../profile-achievements-step.component.html | 150 +++++ .../profile-achievements-step.component.scss | 114 ++++ .../profile-achievements-step.component.ts | 73 +++ .../profile-education-step.component.html | 191 +++++++ .../profile-education-step.component.scss | 108 ++++ .../profile-education-step.component.ts | 72 +++ .../profile-experience-step.component.html | 170 ++++++ .../profile-experience-step.component.scss | 108 ++++ .../profile-experience-step.component.ts | 65 +++ .../profile-main-step.component.html | 258 +++++++++ .../profile-main-step.component.scss | 97 ++++ .../profile-main-step.component.ts | 79 +++ .../profile-skills-step.component.html | 129 +++++ .../profile-skills-step.component.scss | 114 ++++ .../profile-skills-step.component.ts | 96 ++++ 102 files changed, 11949 insertions(+) create mode 100644 projects/core/src/lib/guards/profile-edit/profile-edit.guard.ts create mode 100644 projects/social_platform/src/app/api/auth/facades/auth-email.service.ts create mode 100644 projects/social_platform/src/app/api/auth/facades/auth-login.service.ts create mode 100644 projects/social_platform/src/app/api/auth/facades/auth-password.service.ts create mode 100644 projects/social_platform/src/app/api/auth/facades/auth-register.service.ts create mode 100644 projects/social_platform/src/app/api/auth/facades/ui/auth-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/chat/facedes/chat-direct-info.service.ts create mode 100644 projects/social_platform/src/app/api/chat/facedes/chat-info.service.ts create mode 100644 projects/social_platform/src/app/api/chat/facedes/ui/chat-direct-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/chat/facedes/ui/chat-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/expand/expand.service.ts create mode 100644 projects/social_platform/src/app/api/feed/facades/feed-info.service.ts create mode 100644 projects/social_platform/src/app/api/feed/facades/ui/feed-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/member/facades/members-info.service.ts create mode 100644 projects/social_platform/src/app/api/member/facades/ui/members-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/news/news-info.service.ts create mode 100644 projects/social_platform/src/app/api/office/facades/office-info.service.ts create mode 100644 projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/onboarding-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-one-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-three-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-two-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-zero-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-one-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-three-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-two-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-zero-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/paths/navigation.service.ts create mode 100644 projects/social_platform/src/app/api/paths/paths.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/detail/profile-detail-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/detail/profile-detail-projects-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/detail/ui/profile-detail-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/edit/profile-edit-achievements-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/edit/profile-edit-education-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/edit/profile-edit-experience-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/edit/profile-edit-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/edit/profile-edit-skills-info.service.ts create mode 100644 projects/social_platform/src/app/api/profile/facades/edit/profile-form.service.ts create mode 100644 projects/social_platform/src/app/api/program/facades/detail/program-detail-list-info.service.ts create mode 100644 projects/social_platform/src/app/api/program/facades/detail/program-detail-main-info.service.ts create mode 100644 projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-list-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-main-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/program/facades/program-info.service.ts create mode 100644 projects/social_platform/src/app/api/program/facades/program-main-info.service.ts create mode 100644 projects/social_platform/src/app/api/program/facades/ui/program-main-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/dto/create-vacancy.model.ts create mode 100644 projects/social_platform/src/app/api/project/facades/dashboard/projects-dashboard-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/dashboard/ui/projects-dashboard-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/detail/chat/projects-detail-chat.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/detail/projects-detail.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/detail/ui/projects-detail-ui.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/detail/work-section/projects-detail-work-section-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/detail/work-section/ui/projects-detail-work-section-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-achievements.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-additional.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-contacts.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-form.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-goals.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-partner.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-resources.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-team.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/project-vacancy.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/projects-edit-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/ui/project-goals-ui.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/ui/project-team-ui.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/ui/project-vacancy-ui.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/edit/ui/projects-edit-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/list/projects-list-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/projects-info.service.ts create mode 100644 projects/social_platform/src/app/api/project/facades/ui/projects-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/searches/searches.service.ts create mode 100644 projects/social_platform/src/app/api/skills/facades/skills-info.service.ts create mode 100644 projects/social_platform/src/app/api/swipe/swipe.service.ts create mode 100644 projects/social_platform/src/app/api/tooltip/tooltip-info.service.ts create mode 100644 projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-detail-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-ui-info.service.ts create mode 100644 projects/social_platform/src/app/api/vacancy/facades/vacancy-detail-info.service.ts create mode 100644 projects/social_platform/src/app/api/vacancy/facades/vacancy-info.service.ts create mode 100644 projects/social_platform/src/app/domain/auth/register.model.ts create mode 100644 projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-info.service.ts create mode 100644 projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-ui-info.service.ts create mode 100644 projects/social_platform/src/app/ui/components/detail/services/detail-info.service.ts create mode 100644 projects/social_platform/src/app/ui/components/detail/services/project/detail-project-info.service.ts create mode 100644 projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.html create mode 100644 projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.scss create mode 100644 projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.ts create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.html create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.scss create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.ts create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.html create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.scss create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.ts create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.html create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.scss create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.ts create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.html create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.scss create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.ts create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.html create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.scss create mode 100644 projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.ts diff --git a/projects/core/src/lib/guards/profile-edit/profile-edit.guard.ts b/projects/core/src/lib/guards/profile-edit/profile-edit.guard.ts new file mode 100644 index 00000000..98d62add --- /dev/null +++ b/projects/core/src/lib/guards/profile-edit/profile-edit.guard.ts @@ -0,0 +1,28 @@ +/** @format */ + +import { inject, signal } from "@angular/core"; +import { ActivatedRouteSnapshot, CanActivateFn, Router, UrlTree } from "@angular/router"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { Observable, of } from "rxjs"; + +export const ProfileEditRequiredGuard: CanActivateFn = ( + route: ActivatedRouteSnapshot +): Observable => { + const router = inject(Router); + const authService = inject(AuthService); + + const loggedUserId = signal(undefined); + + authService.profile.subscribe({ + next: profile => { + loggedUserId.set(profile.id); + }, + }); + + const profileId = Number(route.paramMap.get("id")); + if (profileId !== loggedUserId()) { + return of(router.createUrlTree([`/office/profile/${profileId}/`])); + } + + return of(router.createUrlTree([`/office/profel/${profileId}/`])); +}; diff --git a/projects/social_platform/src/app/api/auth/facades/auth-email.service.ts b/projects/social_platform/src/app/api/auth/facades/auth-email.service.ts new file mode 100644 index 00000000..0c178223 --- /dev/null +++ b/projects/social_platform/src/app/api/auth/facades/auth-email.service.ts @@ -0,0 +1,80 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { TokenService } from "@corelib"; +import { filter, interval, map, Subject, takeUntil } from "rxjs"; +import { AuthService } from "../auth.service"; + +@Injectable() +export class AuthEmailService { + private readonly tokenService = inject(TokenService); + private readonly route = inject(ActivatedRoute); + private readonly authService = inject(AuthService); + private readonly router = inject(Router); + + private readonly destroy$ = new Subject(); + + // ConfirmEmail Component + private readonly userEmail = signal(undefined); + + // VerificationEmail Component + readonly counter = signal(0); + private timerStarted = false; + + // ConfirmEmail Component + + initializationTokens(): void { + this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe(queries => { + const { access_token: accessToken, refresh_token: refreshToken } = queries; + this.tokenService.memTokens({ access: accessToken, refresh: refreshToken }); + + if (this.tokenService.getTokens() !== null) { + this.router + .navigateByUrl("/office") + .then(() => console.debug("Route changed from ConfirmEmailComponent")); + } + }); + } + + // VerificationEmail Component + + initializationEmail(): void { + this.route.queryParams + .pipe( + map(r => r["adress"]), + takeUntil(this.destroy$) + ) + .subscribe(address => { + this.userEmail.set(address); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + onResend(): void { + if (!this.userEmail()) return; + + this.authService + .resendEmail(this.userEmail()!) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.counter.set(60); + }); + } + + initializationTimer(): void { + if (this.timerStarted) return; + this.timerStarted = true; + this.timer$.subscribe(); + } + + timer$ = interval(1000).pipe( + filter(() => this.counter() > 0), + map(() => this.counter.update(c => c - 1)), + takeUntil(this.destroy$) + ); +} diff --git a/projects/social_platform/src/app/api/auth/facades/auth-login.service.ts b/projects/social_platform/src/app/api/auth/facades/auth-login.service.ts new file mode 100644 index 00000000..bfefd175 --- /dev/null +++ b/projects/social_platform/src/app/api/auth/facades/auth-login.service.ts @@ -0,0 +1,62 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { TokenService, ValidationService } from "@corelib"; +import { Subject, takeUntil } from "rxjs"; +import { AuthService } from "../auth.service"; +import { AuthUIInfoService } from "./ui/auth-ui-info.service"; +import { LoginRequest } from "../../../domain/auth/http.model"; + +@Injectable() +export class AuthLoginService { + private readonly tokenService = inject(TokenService); + private readonly authService = inject(AuthService); + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly authUIInfoService = inject(AuthUIInfoService); + + private readonly destroy$ = new Subject(); + + // Login Component + readonly showPassword = this.authUIInfoService.showPassword; + readonly loginIsSubmitting = this.authUIInfoService.loginIsSubmitting; + readonly errorWrongAuth = this.authUIInfoService.errorWrongAuth; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + onSubmit(loginForm: LoginRequest) { + const redirectType = this.route.snapshot.queryParams["redirect"]; + + this.loginIsSubmitting.set(true); + + this.authService + .login(loginForm) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: res => { + this.tokenService.memTokens(res); + this.loginIsSubmitting.set(false); + + if (!redirectType) + this.router + .navigateByUrl("/office") + .then(() => console.debug("Route changed from LoginComponent")); + else if (redirectType === "program") + this.router + .navigateByUrl("/office/program/list") + .then(() => console.debug("Route changed from LoginComponent")); + }, + error: error => { + if (error.status === 401) { + this.errorWrongAuth.set(true); + } + + this.loginIsSubmitting.set(false); + }, + }); + } +} diff --git a/projects/social_platform/src/app/api/auth/facades/auth-password.service.ts b/projects/social_platform/src/app/api/auth/facades/auth-password.service.ts new file mode 100644 index 00000000..e2343352 --- /dev/null +++ b/projects/social_platform/src/app/api/auth/facades/auth-password.service.ts @@ -0,0 +1,82 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; +import { ValidationService } from "@corelib"; +import { map, Subject, takeUntil } from "rxjs"; +import { AuthService } from "../auth.service"; +import { AuthUIInfoService } from "./ui/auth-ui-info.service"; + +@Injectable() +export class AuthPasswordService { + private readonly route = inject(ActivatedRoute); + private readonly authService = inject(AuthService); + private readonly router = inject(Router); + private readonly validationService = inject(ValidationService); + private readonly authUIInfoService = inject(AuthUIInfoService); + + private readonly destroy$ = new Subject(); + + // ResetPassword-Confirmation Component + readonly email = this.route.queryParams.pipe( + map(r => r["email"]), + takeUntil(this.destroy$) + ); + + // ResetPassword Component + readonly isSubmitting = this.authUIInfoService.isSubmitting; + readonly errorRequest = this.authUIInfoService.errorRequest; + readonly credsSubmitInitiated = this.authUIInfoService.credsSubmitInitiated; + private readonly errorServer = this.authUIInfoService.errorServer; + + // ResetPassword Component + onSubmitResetPassword(resetForm: FormGroup): void { + if (!this.validationService.getFormValidation(resetForm)) return; + + this.errorServer.set(false); + this.isSubmitting.set(true); + + this.authService.resetPassword(resetForm.value.email).subscribe({ + next: () => { + this.router + .navigate(["/auth/reset_password/confirm"], { + queryParams: { email: resetForm.value.email }, + }) + .then(() => console.debug("ResetPasswordComponent")); + }, + error: () => { + this.errorServer.set(true); + this.isSubmitting.set(false); + + resetForm.reset(); + }, + complete: () => { + this.isSubmitting.set(false); + }, + }); + } + + // SetPassword Component + onSubmitSetPassword(passwordForm: FormGroup): void { + this.credsSubmitInitiated.set(true); + const token = this.route.snapshot.queryParamMap.get("token"); + + if (!token || !this.validationService.getFormValidation(passwordForm)) return; + + this.authService.setPassword(passwordForm.value.password, token).subscribe({ + next: () => { + this.router.navigateByUrl("/auth/login").then(() => console.debug("SetPasswordComponent")); + }, + error: error => { + console.error("Error setting password:", error); + this.errorRequest.set(true); + }, + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/projects/social_platform/src/app/api/auth/facades/auth-register.service.ts b/projects/social_platform/src/app/api/auth/facades/auth-register.service.ts new file mode 100644 index 00000000..8e61c8d1 --- /dev/null +++ b/projects/social_platform/src/app/api/auth/facades/auth-register.service.ts @@ -0,0 +1,67 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormGroup } from "@angular/forms"; +import { Router } from "@angular/router"; +import { Subject, takeUntil } from "rxjs"; +import { AuthService } from "../auth.service"; +import { ValidationService } from "@corelib"; +import { AuthUIInfoService } from "./ui/auth-ui-info.service"; +import dayjs from "dayjs"; + +@Injectable() +export class AuthRegisterService { + private readonly authService = inject(AuthService); + private readonly router = inject(Router); + private readonly validationService = inject(ValidationService); + private readonly authUIInfoService = inject(AuthUIInfoService); + + readonly registerAgreement = this.authUIInfoService.registerAgreement; + readonly ageAgreement = this.authUIInfoService.ageAgreement; + readonly registerIsSubmitting = this.authUIInfoService.registerIsSubmitting; + readonly credsSubmitInitiated = this.authUIInfoService.credsSubmitInitiated; + readonly infoSubmitInitiated = this.authUIInfoService.infoSubmitInitiated; + + readonly showPassword = this.authUIInfoService.showPassword; + readonly showPasswordRepeat = this.authUIInfoService.showPasswordRepeat; + + readonly isUserCreationModalError = this.authUIInfoService.isUserCreationModalError; + + readonly step = this.authUIInfoService.step; + + readonly serverErrors = signal([]); + + private readonly destroy$ = new Subject(); + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + onSendForm(registerForm: FormGroup): void { + const form = this.authUIInfoService.prepareFormValues(registerForm); + + this.registerIsSubmitting.set(true); + + this.authService + .register(form) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => { + this.registerIsSubmitting.set(false); + this.router.navigateByUrl("/auth/verification/email?adress=" + form.email); + }, + error: error => { + const emailErrors = error?.error?.email; + + if (error.status === 400 && Array.isArray(emailErrors)) { + this.serverErrors.set(Object.values(error.error).flat() as string[]); + } else if (error.status === 500) { + this.isUserCreationModalError.set(true); + } + + this.registerIsSubmitting.set(false); + }, + }); + } +} diff --git a/projects/social_platform/src/app/api/auth/facades/ui/auth-ui-info.service.ts b/projects/social_platform/src/app/api/auth/facades/ui/auth-ui-info.service.ts new file mode 100644 index 00000000..e4a8a4fa --- /dev/null +++ b/projects/social_platform/src/app/api/auth/facades/ui/auth-ui-info.service.ts @@ -0,0 +1,143 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; +import { ValidationService } from "@corelib"; +import dayjs from "dayjs"; + +@Injectable() +export class AuthUIInfoService { + private readonly fb = inject(FormBuilder); + private readonly validationService = inject(ValidationService); + + // login + readonly showPasswordRepeat = signal(false); + readonly showPassword = signal(false); + + readonly loginIsSubmitting = signal(false); + readonly errorWrongAuth = signal(false); + + // password + readonly isSubmitting = signal(false); + readonly credsSubmitInitiated = signal(false); + + readonly errorServer = signal(false); + readonly errorRequest = signal(false); + + // register + readonly registerAgreement = signal(false); + readonly ageAgreement = signal(false); + + readonly registerIsSubmitting = signal(false); + readonly infoSubmitInitiated = signal(false); + + readonly isUserCreationModalError = signal(false); + readonly step = signal<"credentials" | "info">("credentials"); + + // login + readonly loginForm = this.fb.group({ + email: ["", [Validators.required, Validators.email]], + password: ["", [Validators.required]], + }); + + // register + readonly registerForm = this.fb.group( + { + firstName: ["", [Validators.required, this.validationService.useLanguageValidator()]], + lastName: ["", [Validators.required, this.validationService.useLanguageValidator()]], + birthday: [ + "", + [ + Validators.required, + this.validationService.useDateFormatValidator, + this.validationService.useAgeValidator(), + ], + ], + email: [ + "", + [Validators.required, Validators.email, this.validationService.useEmailValidator()], + ], + password: ["", [Validators.required, this.validationService.usePasswordValidator(8)]], + repeatedPassword: ["", [Validators.required]], + }, + { validators: [this.validationService.useMatchValidator("password", "repeatedPassword")] } + ); + + // reset password + readonly resetForm = this.fb.group({ + email: ["", [Validators.required, Validators.email]], + }); + + // set password + readonly passwordForm = this.fb.group( + { + password: ["", [Validators.required, this.validationService.usePasswordValidator(8)]], + passwordRepeated: ["", [Validators.required]], + }, + { validators: [this.validationService.useMatchValidator("password", "passwordRepeated")] } + ); + + // Login Component + toggleShowPassword(section: "login" | "register", type?: "repeat" | "first") { + if (section === "login") { + this.showPassword.set(!this.showPassword()); + } else { + if (type === "repeat") { + this.showPasswordRepeat.set(!this.showPasswordRepeat()); + } else { + this.showPassword.set(!this.showPassword()); + } + } + } + + // register + onInfoStep(registerForm: FormGroup) { + const fields = [ + registerForm.get("email"), + registerForm.get("password"), + registerForm.get("repeatedPassword"), + ]; + + const errors = fields.map(field => { + field?.markAsTouched(); + return !!field?.valid; + }); + + if (errors.every(Boolean) && this.registerAgreement() && this.ageAgreement()) { + this.step.set("info"); + } + } + + prepareFormValues(registerForm: FormGroup) { + const form = { + ...registerForm.value, + birthday: registerForm.value.birthday + ? dayjs(registerForm.value.birthday, "DD.MM.YYYY").format("YYYY-MM-DD") + : undefined, + }; + delete form.repeatedPassword; + + return form; + } + + onSubmit(registerForm: FormGroup): FormGroup | null { + if (this.step() === "credentials") { + this.credsSubmitInitiated.set(true); + this.onInfoStep(registerForm); + return null; + } + + if (this.step() === "info") { + this.infoSubmitInitiated.set(true); + + if (registerForm.invalid) { + registerForm.markAllAsTouched(); + return null; + } + + return registerForm; + } + + return null; + } +} diff --git a/projects/social_platform/src/app/api/chat/facedes/chat-direct-info.service.ts b/projects/social_platform/src/app/api/chat/facedes/chat-direct-info.service.ts new file mode 100644 index 00000000..010927c9 --- /dev/null +++ b/projects/social_platform/src/app/api/chat/facedes/chat-direct-info.service.ts @@ -0,0 +1,273 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { ActivatedRoute } from "@angular/router"; +import { AuthService } from "../../auth"; +import { ChatService } from "../chat.service"; +import { ChatDirectService } from "../chat-direct/chat-direct.service"; +import { ChatMessage } from "../../../domain/chat/chat-message.model"; +import { map, Observable, Subject, switchMap, takeUntil, tap } from "rxjs"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { ChatDirectUIInfoService } from "./ui/chat-direct-ui-info.service"; + +@Injectable() +export class ChatDirectInfoService { + private readonly route = inject(ActivatedRoute); + private readonly authService = inject(AuthService); + private readonly chatService = inject(ChatService); + private readonly chatDirectService = inject(ChatDirectService); + private readonly chatDirectUIInfoService = inject(ChatDirectUIInfoService); + + private readonly destroy$ = new Subject(); + + // Сохраняем тип чата для использования в методах + private chatType: "direct" | "project" = "direct"; + + /** Список пользователей, которые сейчас печатают */ + readonly typingPersons = this.chatDirectUIInfoService.typingPersons; + + /** Данные текущего чата */ + readonly chat = this.chatDirectUIInfoService.chat; + + /** Массив сообщений чата */ + readonly messages = this.chatDirectUIInfoService.messages; + + /** Все файлы, загруженные в чат */ + readonly chatFiles = this.chatDirectUIInfoService.chatFiles; + + /** ID текущего пользователя */ + readonly currentUserId = this.chatDirectUIInfoService.currentUserId; + + /** Флаг процесса загрузки сообщений */ + readonly fetching = this.chatDirectUIInfoService.fetching; + + initializationChatDirect(type: "direct" | "project"): void { + this.chatType = type; // Сохраняем тип чата + + this.route.data + .pipe( + map(r => r["data"]), + tap(chat => this.chat.set(chat)), + switchMap(() => this.fetchMessages(type)), + takeUntil(this.destroy$) + ) + .subscribe(); + + // Инициализация обработчиков WebSocket событий + this.initMessageEvent(); + this.initTypingEvent(); + this.initDeleteEvent(); + this.initEditEvent(); + this.initReadEvent(); + + this.initializationProfile(); + } + + /** + * Инициализирует загрузку файлов чата + * Для прямых чатов: загружает файлы из прямого чата + * Для чатов проектов: загружает файлы из проекта + * + */ + initializationChatFiles(): void { + if (this.chatType === "project") { + // Загрузка файлов чата проекта + this.chatService + .loadProjectFiles(Number(this.route.parent?.snapshot.paramMap.get("projectId"))) + .pipe(takeUntil(this.destroy$)) + .subscribe(files => { + this.chatFiles.set(files); + }); + } else if (this.chatType === "direct") { + // Загрузка файлов прямого чата + const chatId = this.chat()?.id; + if (chatId) { + this.chatService + .loadDirectChatFiles(chatId) + .pipe(takeUntil(this.destroy$)) + .subscribe( + files => { + this.chatFiles.set(files); + }, + error => { + // Если метод не поддерживается на сервере, логируем ошибку + console.warn("Failed to load direct chat files:", error); + } + ); + } + } + } + + private initializationProfile(): void { + this.authService.profile.pipe(takeUntil(this.destroy$)).subscribe(u => { + this.currentUserId.set(u.id); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + + this.chatDirectUIInfoService.clearTypingTimeouts(); + } + + /** + * Получает ID чата в зависимости от типа + */ + private getChatId(): string { + return this.chatType === "direct" + ? this.chat()?.id ?? "" + : this.route.parent?.snapshot.paramMap.get("projectId") ?? ""; + } + + /** + * Загружает сообщения чата с сервера с поддержкой пагинации + */ + private fetchMessages(type: "direct" | "project"): Observable> { + return type === "direct" + ? this.chatDirectService + .loadMessages( + this.getChatId(), + this.messages().length > 0 ? this.messages().length : 0, + this.chatDirectUIInfoService.messagesPerFetch + ) + .pipe( + tap(messages => { + this.chatDirectUIInfoService.applyInitMessagesEvent(messages); + }) + ) + : this.chatService + .loadMessages( + this.getChatId(), + this.messages().length > 0 ? this.messages().length : 0, + this.chatDirectUIInfoService.messagesPerFetch + ) + .pipe( + tap(messages => { + this.chatDirectUIInfoService.applyInitMessagesEvent(messages); + }) + ); + } + + private initMessageEvent(): void { + this.chatService + .onMessage() + .pipe(takeUntil(this.destroy$)) + .subscribe(result => { + this.chatDirectUIInfoService.applyMessageEvent(result); + }); + } + + private initTypingEvent(): void { + this.chatService + .onTyping() + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.chatDirectUIInfoService.applyTypingEvent(); + }); + } + + private initEditEvent(): void { + this.chatService + .onEditMessage() + .pipe(takeUntil(this.destroy$)) + .subscribe(result => { + this.chatDirectUIInfoService.editMessahesEvent(result); + }); + } + + private initDeleteEvent(): void { + this.chatService + .onDeleteMessage() + .pipe(takeUntil(this.destroy$)) + .subscribe(result => { + this.chatDirectUIInfoService.deleteMessagesEvent(result); + }); + } + + private initReadEvent(): void { + this.chatService + .onReadMessage() + .pipe(takeUntil(this.destroy$)) + .subscribe(result => { + this.chatDirectUIInfoService.readMessagesEvent(result); + }); + } + + /** + * Обработчик запроса на загрузку дополнительных сообщений + */ + onFetchMessages(): void { + if ( + (this.messages().length < this.chatDirectUIInfoService.messagesTotalCount() || + this.chatDirectUIInfoService.messagesTotalCount() === 0) && + !this.fetching() + ) { + this.fetching.set(true); + this.fetchMessages(this.chatType) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.fetching.set(false); + }); + } + } + + /** + * Обработчик отправки нового сообщения + */ + onSubmitMessage(message: any): void { + this.chatService.sendMessage({ + replyTo: message.replyTo, + text: message.text, + fileUrls: message.fileUrls, + chatType: this.chatType, + chatId: this.getChatId(), + }); + } + + /** + * Обработчик редактирования сообщения + */ + onEditMessage(message: ChatMessage): void { + this.chatService.editMessage({ + text: message.text, + messageId: message.id, + chatType: this.chatType, + chatId: this.getChatId(), + }); + } + + /** + * Обработчик удаления сообщения + */ + onDeleteMessage(messageId: number): void { + this.chatService.deleteMessage({ + chatId: this.getChatId(), + chatType: this.chatType, + messageId, + }); + } + + /** + * Обработчик события печатания + * Использует сохранённый chatType + */ + onType(): void { + this.chatService.startTyping({ + chatType: this.chatType, + chatId: this.getChatId(), + }); + } + + /** + * Обработчик прочтения сообщения + * Использует сохранённый chatType + */ + onReadMessage(messageId: number): void { + this.chatService.readMessage({ + chatType: this.chatType, + chatId: this.getChatId(), + messageId, + }); + } +} diff --git a/projects/social_platform/src/app/api/chat/facedes/chat-info.service.ts b/projects/social_platform/src/app/api/chat/facedes/chat-info.service.ts new file mode 100644 index 00000000..3e4fe604 --- /dev/null +++ b/projects/social_platform/src/app/api/chat/facedes/chat-info.service.ts @@ -0,0 +1,84 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { NavService } from "@ui/services/nav/nav.service"; +import { AuthService } from "../../auth"; +import { ChatService } from "../chat.service"; +import { ChatListItem } from "../../../domain/chat/chat-item.model"; +import { combineLatest, map, Observable, Subject, takeUntil } from "rxjs"; +import { toObservable } from "@angular/core/rxjs-interop"; +import { ChatUIInfoService } from "./ui/chat-ui-info.service"; + +@Injectable() +export class ChatInfoService { + private readonly navService = inject(NavService); + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly authService = inject(AuthService); + private readonly chatService = inject(ChatService); + private readonly chatUIInfoService = inject(ChatUIInfoService); + + private readonly destroy$ = new Subject(); + + private readonly chatsData = this.chatUIInfoService.chatsData; + + readonly chats: Observable = combineLatest([ + this.authService.profile, + toObservable(this.chatsData), + ]).pipe( + map(([profile, chats]) => + chats.map(chat => ({ + ...chat, + unread: profile.id !== chat.lastMessage.author.id && !chat.lastMessage.isRead, + })) + ), + map(chats => chats.sort((a, b) => Number(b.unread) - Number(a.unread))), + map(chats => chats.map(({ unread, ...chat }) => chat)), + takeUntil(this.destroy$) + ); + + initializationChats(): void { + this.navService.setNavTitle("Чат"); + + setTimeout(() => { + this.chatService.unread$.next(false); + }); + + this.initializationChatMessage(); + + this.route.data + .pipe( + map(r => r["data"]), + takeUntil(this.destroy$) + ) + .subscribe(chats => { + this.chatsData.set(chats); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + private initializationChatMessage(): void { + this.chatService + .onMessage() + .pipe(takeUntil(this.destroy$)) + .subscribe(result => { + this.chatUIInfoService.applyInitializationMessages(result); + }); + } + + onGotoChat(id: string | number) { + const redirectUrl = + typeof id === "string" && id.includes("_") + ? `/office/chats/${id}` + : `/office/projects/${id}/chat`; + + this.router + .navigateByUrl(redirectUrl) + .then(() => console.debug("Route changed from ChatComponent")); + } +} diff --git a/projects/social_platform/src/app/api/chat/facedes/ui/chat-direct-ui-info.service.ts b/projects/social_platform/src/app/api/chat/facedes/ui/chat-direct-ui-info.service.ts new file mode 100644 index 00000000..954692aa --- /dev/null +++ b/projects/social_platform/src/app/api/chat/facedes/ui/chat-direct-ui-info.service.ts @@ -0,0 +1,99 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { ChatWindowComponent } from "@ui/components/chat-window/chat-window.component"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { ChatItem } from "projects/social_platform/src/app/domain/chat/chat-item.model"; +import { + ChatFile, + ChatMessage, +} from "projects/social_platform/src/app/domain/chat/chat-message.model"; +import { + OnChatMessageDto, + OnDeleteChatMessageDto, + OnEditChatMessageDto, + OnReadChatMessageDto, +} from "projects/social_platform/src/app/domain/chat/chat.model"; + +@Injectable() +export class ChatDirectUIInfoService { + /** Список пользователей, которые сейчас печатают */ + readonly typingPersons = signal([]); + private readonly typingTimeouts = new Set(); + + /** Данные текущего чата */ + readonly chat = signal(undefined); + + /** Массив сообщений чата */ + readonly messages = signal([]); + + /** Все файлы, загруженные в чат */ + readonly chatFiles = signal([]); + + /** ID текущего пользователя */ + readonly currentUserId = signal(undefined); + + /** Флаг процесса загрузки сообщений */ + readonly fetching = signal(false); + + /** + * Количество сообщений, загружаемых за один запрос + */ + readonly messagesPerFetch = 20; + + /** + * Общее количество сообщений в чате (приходит с сервера) + */ + readonly messagesTotalCount = signal(0); + + readMessagesEvent(result: OnReadChatMessageDto): void { + this.messages.update(list => + list.map(m => (m.id === result.messageId ? { ...m, isRead: true } : m)) + ); + } + + deleteMessagesEvent(result: OnDeleteChatMessageDto): void { + this.messages.update(list => list.filter(m => m.id !== result.messageId)); + } + + editMessahesEvent(result: OnEditChatMessageDto): void { + this.messages.update(list => list.map(m => (m.id === result.message.id ? result.message : m))); + } + + applyTypingEvent(): void { + if (!this.chat()?.opponent) return; + + const userId = this.chat()!.opponent.id; + + this.typingPersons.update(list => [ + ...list, + { + firstName: this.chat()!.opponent.firstName, + lastName: this.chat()!.opponent.lastName, + userId, + }, + ]); + + const timeoutId = window.setTimeout(() => { + this.typingPersons.update(list => list.filter(p => p.userId !== userId)); + this.typingTimeouts.delete(timeoutId); + }, 2000); + + this.typingTimeouts.add(timeoutId); + } + + applyMessageEvent(result: OnChatMessageDto): void { + this.messages.update(() => [...this.messages(), result.message]); + } + + applyInitMessagesEvent(messages: ApiPagination): void { + // Добавляем новые сообщения в начало массива (реверсируем порядок с сервера) + this.messages.update(() => messages.results.reverse().concat(this.messages())); + this.messagesTotalCount.set(messages.count); + } + + clearTypingTimeouts(): void { + this.typingTimeouts.forEach(id => clearTimeout(id)); + this.typingTimeouts.clear(); + } +} diff --git a/projects/social_platform/src/app/api/chat/facedes/ui/chat-ui-info.service.ts b/projects/social_platform/src/app/api/chat/facedes/ui/chat-ui-info.service.ts new file mode 100644 index 00000000..2d6be592 --- /dev/null +++ b/projects/social_platform/src/app/api/chat/facedes/ui/chat-ui-info.service.ts @@ -0,0 +1,19 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { ChatListItem } from "projects/social_platform/src/app/domain/chat/chat-item.model"; +import { OnChatMessageDto } from "projects/social_platform/src/app/domain/chat/chat.model"; + +@Injectable() +export class ChatUIInfoService { + readonly chatsData = signal([]); + + applyInitializationMessages(result: OnChatMessageDto): void { + this.chatsData.update(list => { + const idx = list.findIndex(c => c.id === result.chatId); + if (idx === -1) return list; + + return list.map((chat, i) => (i === idx ? { ...chat, lastMessage: result.message } : chat)); + }); + } +} diff --git a/projects/social_platform/src/app/api/expand/expand.service.ts b/projects/social_platform/src/app/api/expand/expand.service.ts new file mode 100644 index 00000000..d7b9ad8f --- /dev/null +++ b/projects/social_platform/src/app/api/expand/expand.service.ts @@ -0,0 +1,50 @@ +/** @format */ + +import { ElementRef, Injectable, signal } from "@angular/core"; +import { expandElement } from "@utils/expand-element"; + +@Injectable({ providedIn: "root" }) +export class ExpandService { + readonly readFullDescription = signal(false); + readonly descriptionExpandable = signal(false); + + readonly readFullSkills = signal(false); + readonly skillsExpandable = signal(false); + + readonly readAllAchievements = signal(false); // Флаг показа всех достижений + + readonly readAllVacancies = signal(false); // Флаг показа всех вакансий + + readonly readAllMembers = signal(false); // Флаг показа всех участников + + readonly readAllProjects = signal(false); + + readonly readAllPrograms = signal(false); + + readonly readAllLinks = signal(false); + + readonly readAllEducation = signal(false); + + readonly readAllLanguages = signal(false); + + readonly readAllWorkExperience = signal(false); + + onExpand( + type: "description" | "skills", + elem: HTMLElement, + expandedClass: string, + isExpanded: boolean + ): void { + expandElement(elem, expandedClass, isExpanded); + type === "description" + ? this.readFullDescription.set(!isExpanded) + : this.readFullSkills.set(!isExpanded); + } + + checkExpandable(type: "description" | "skills", hasText: boolean, descEl?: ElementRef): void { + const el = descEl?.nativeElement; + type === "description" + ? this.descriptionExpandable.set(!!el && hasText && el.scrollHeight > el.clientHeight) + : this.skillsExpandable.set(!!el && hasText && el.scrollHeight > el.clientHeight); + } +} diff --git a/projects/social_platform/src/app/api/feed/facades/feed-info.service.ts b/projects/social_platform/src/app/api/feed/facades/feed-info.service.ts new file mode 100644 index 00000000..7a0d1f89 --- /dev/null +++ b/projects/social_platform/src/app/api/feed/facades/feed-info.service.ts @@ -0,0 +1,230 @@ +/** @format */ + +import { ElementRef, inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute } from "@angular/router"; +import { + concatMap, + EMPTY, + fromEvent, + map, + Observable, + skip, + Subject, + takeUntil, + tap, + throttleTime, +} from "rxjs"; +import { ProjectNewsService } from "../../project/project-news.service"; +import { ProfileNewsService } from "../../profile/profile-news.service"; +import { FeedService } from "../feed.service"; +import { FeedItem, FeedItemType } from "../../../domain/feed/feed-item.model"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { FeedUIInfoService } from "./ui/feed-ui-info.service"; + +@Injectable() +export class FeedInfoService { + private readonly route = inject(ActivatedRoute); + private readonly projectNewsService = inject(ProjectNewsService); + private readonly profileNewsService = inject(ProfileNewsService); + private readonly feedService = inject(FeedService); + private readonly feedUIInfoService = inject(FeedUIInfoService); + + private observer?: IntersectionObserver; + private readonly destroy$ = new Subject(); + + readonly feedItems = this.feedUIInfoService.feedItems; + + private readonly includes = signal([]); + + initializationFeedNews(feedRoot: ElementRef): void { + this.route.data + .pipe( + map(r => r["data"]), + takeUntil(this.destroy$) + ) + .subscribe((feed: ApiPagination) => { + this.feedUIInfoService.applyInitializationFeedNewsEvent(feed); + + this.observer?.disconnect(); + + this.observer = new IntersectionObserver(this.onFeedItemView.bind(this), { + root: document.querySelector(".office__body"), + threshold: 0, + }); + }); + + this.route.queryParams + .pipe( + map(params => params["includes"]), + tap(includes => { + this.includes.set(includes); + }), + skip(1), + concatMap(includes => { + this.feedUIInfoService.totalItemsCount.set(0); + this.feedUIInfoService.feedPage.set(0); + + return this.onFetch( + 0, + this.feedUIInfoService.perFetchTake(), + includes ?? ["vacancy", "project", "news"] + ); + }), + takeUntil(this.destroy$) + ) + .subscribe(feed => { + this.feedUIInfoService.applyFeedFilters(feed); + + setTimeout(() => { + feedRoot?.nativeElement.children[0].scrollIntoView({ behavior: "smooth" }); + }); + }); + } + + // onScroll Section + // ------------------- + + private onScroll(target: HTMLElement, feedRoot: ElementRef): Observable { + if ( + this.feedUIInfoService.totalItemsCount() && + this.feedItems().length >= this.feedUIInfoService.totalItemsCount() + ) + return EMPTY; + + if (!target || !feedRoot) return EMPTY; + + const diff = + target.scrollTop - feedRoot.nativeElement.getBoundingClientRect().height + window.innerHeight; + + if (diff > 0) { + const currentOffset = this.feedItems().length; + + return this.onFetch( + currentOffset, + this.feedUIInfoService.perFetchTake(), + this.includes() + ).pipe( + tap((feedChunk: FeedItem[]) => { + const existingIds = new Set(this.feedItems().map(item => item.content.id)); + const uniqueNewItems = feedChunk.filter(item => !existingIds.has(item.content.id)); + + if (uniqueNewItems.length > 0) { + this.feedUIInfoService.feedPage.update(page => page + uniqueNewItems.length); + this.feedItems.update(items => { + const next = [...items, ...uniqueNewItems]; + queueMicrotask(() => this.observeFeedItems()); + return next; + }); + } + }) + ); + } + + return EMPTY; + } + + // target for Scroll Section + // ------------------- + + initScroll(target: HTMLElement, feedRoot: ElementRef): void { + if (target) { + fromEvent(target, "scroll") + .pipe( + throttleTime(100), + concatMap(() => this.onScroll(target, feedRoot)), + takeUntil(this.destroy$) + ) + .subscribe(); + } + } + + private onFetch( + offset: number, + limit: number, + includes: FeedItemType[] = ["project", "vacancy", "news"] + ) { + return this.feedService.getFeed(offset, limit, includes).pipe( + tap(res => { + this.feedUIInfoService.totalItemsCount.set(res.count); + }), + map(res => res.results) + ); + } + + private onFeedItemView(entries: IntersectionObserverEntry[]): void { + const items = entries + .map(e => { + return Number((e.target as HTMLElement).dataset["id"]); + }) + .map(id => this.feedItems().find(item => item.content.id === id)) + .filter(Boolean) as FeedItem[]; + + const projectNews = items.filter( + item => item.typeModel === "news" && !("email" in item.content.contentObject) + ); + const profileNews = items.filter( + item => item.typeModel === "news" && "email" in item.content.contentObject + ); + + projectNews.forEach(news => { + if (news.typeModel !== "news") return; + this.projectNewsService + .readNews(news.content.contentObject.id, [news.content.id]) + .pipe(takeUntil(this.destroy$)) + .subscribe(); + }); + + profileNews.forEach(news => { + if (news.typeModel !== "news") return; + this.profileNewsService + .readNews(news.content.contentObject.id, [news.content.id]) + .pipe(takeUntil(this.destroy$)) + .subscribe(); + }); + } + + onLike(newsId: number) { + const itemIdx = this.feedItems().findIndex(n => n.content.id === newsId); + + const item = this.feedItems()[itemIdx]; + if (!item || item.typeModel !== "news") return; + + if ("email" in item.content.contentObject) { + this.profileNewsService + .toggleLike( + item.content.contentObject.id as unknown as string, + newsId, + !item.content.isUserLiked + ) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.feedUIInfoService.applyLikeNews(itemIdx); + }); + } else if ("leader" in item.content.contentObject) { + this.projectNewsService + .toggleLike( + item.content.contentObject.id as unknown as string, + newsId, + !item.content.isUserLiked + ) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.feedUIInfoService.applyLikeNews(itemIdx); + }); + } + } + + private observeFeedItems(): void { + if (!this.observer) return; + + document.querySelectorAll(".page__item").forEach(el => { + this.observer!.observe(el); + }); + } + + destroy(): void { + this.observer?.disconnect(); + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/projects/social_platform/src/app/api/feed/facades/ui/feed-ui-info.service.ts b/projects/social_platform/src/app/api/feed/facades/ui/feed-ui-info.service.ts new file mode 100644 index 00000000..325aa52d --- /dev/null +++ b/projects/social_platform/src/app/api/feed/facades/ui/feed-ui-info.service.ts @@ -0,0 +1,44 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { FeedItem } from "projects/social_platform/src/app/domain/feed/feed-item.model"; + +@Injectable() +export class FeedUIInfoService { + readonly feedItems = signal([]); + + readonly totalItemsCount = signal(0); + readonly feedPage = signal(0); + readonly perFetchTake = signal(20); + + applyInitializationFeedNewsEvent(feed: ApiPagination): void { + this.feedItems.set(feed.results); + this.totalItemsCount.set(feed.count); + this.feedPage.set(feed.results.length); + } + + applyFeedFilters(feed: FeedItem[]): void { + this.feedItems.set(feed); + this.feedPage.set(feed.length); + } + + applyLikeNews(itemIdx: number): void { + this.feedItems.update((items: any) => { + const item = items[itemIdx]; + + const updated = { + ...item, + content: { + ...item.content, + likesCount: item.content.isUserLiked + ? item.content.likesCount - 1 + : item.content.likesCount + 1, + isUserLiked: !item.content.isUserLiked, + }, + }; + + return items.map((it: any, i: number) => (i === itemIdx ? updated : it)); + }); + } +} diff --git a/projects/social_platform/src/app/api/member/facades/members-info.service.ts b/projects/social_platform/src/app/api/member/facades/members-info.service.ts new file mode 100644 index 00000000..919343c9 --- /dev/null +++ b/projects/social_platform/src/app/api/member/facades/members-info.service.ts @@ -0,0 +1,228 @@ +/** @format */ + +import { ElementRef, inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { NavService } from "@ui/services/nav/nav.service"; +import { + concatMap, + debounceTime, + distinctUntilChanged, + EMPTY, + filter, + fromEvent, + map, + skip, + Subject, + switchMap, + take, + takeUntil, + tap, + throttleTime, +} from "rxjs"; +import { MemberService } from "../member.service"; +import { AuthService } from "../../auth"; +import { User } from "../../../domain/auth/user.model"; +import { AbstractControl, FormGroup } from "@angular/forms"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { MembersUIInfoService } from "./ui/members-ui-info.service"; +import { NavigationService } from "../../paths/navigation.service"; + +@Injectable() +export class MembersInfoService { + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly navService = inject(NavService); + private readonly memberService = inject(MemberService); + private readonly membersUIInfoService = inject(MembersUIInfoService); + private readonly authService = inject(AuthService); + private readonly navigationService = inject(NavigationService); + + private readonly searchParams = signal>({}); // Signal для параметров поиска + + private readonly membersTake = this.membersUIInfoService.membersTake; // Количество участников на странице + readonly members = this.membersUIInfoService.members; // Массив участников для отображения + private readonly profileId = this.membersUIInfoService.profileId; + + private readonly searchForm = this.membersUIInfoService.searchForm; + private readonly filterForm = this.membersUIInfoService.filterForm; + + private readonly destroy$ = new Subject(); + + /** + * Инициализация компонента + * + * Выполняет: + * - Очистку URL параметров + * - Установку заголовка навигации + * - Загрузку начальных данных из резолвера + * - Настройку подписок на изменения форм и URL параметровК + */ + initializationMembers(): void { + // Очищаем URL параметры при инициализации + this.router.navigate([], { queryParams: {} }); + + // Устанавливаем заголовок страницы + this.navService.setNavTitle("Участники"); + + this.initializationProfile(); + + this.initializationControls(); + + // Подписываемся на изменения URL параметров для обновления списка участников + this.initializationQueryParams(); + } + + private initializationProfile(): void { + this.authService.profile + .pipe( + filter(user => !!user), + takeUntil(this.destroy$) + ) + .subscribe({ + next: user => { + this.membersUIInfoService.applyProfileId(user); + }, + }); + } + + private initializationControls(): void { + this.route.data + .pipe( + take(1), + map(r => r["data"]), + takeUntil(this.destroy$) + ) + .subscribe((members: ApiPagination) => { + this.membersUIInfoService.applyMembersPagination(members); + }); + + // Настраиваем синхронизацию значений форм с URL параметрами + this.saveControlValue(this.searchForm.get("search"), "fullname"); + this.saveControlValue(this.filterForm.get("keySkill"), "skills__contains"); + this.saveControlValue(this.filterForm.get("speciality"), "speciality__icontains"); + this.saveControlValue(this.filterForm.get("age"), "age"); + this.saveControlValue(this.filterForm.get("isMosPolytechStudent"), "is_mospolytech_student"); + } + + private initializationQueryParams(): void { + this.route.queryParams + .pipe( + skip(1), // Пропускаем первое значение + distinctUntilChanged(), // Игнорируем одинаковые значения + debounceTime(100), // Задержка для предотвращения частых запросов + takeUntil(this.destroy$), + switchMap(params => { + // Формируем параметры для API запроса + const fetchParams: Record = {}; + + if (params["fullname"]) fetchParams["fullname"] = params["fullname"]; + if (params["skills__contains"]) + fetchParams["skills__contains"] = params["skills__contains"]; + if (params["speciality__icontains"]) + fetchParams["speciality__icontains"] = params["speciality__icontains"]; + if (params["is_mospolytech_student"]) + fetchParams["is_mospolytech_student"] = params["is_mospolytech_student"]; + + // Проверяем формат параметра возраста (должен быть "число,число") + if (params["age"] && /\d+,\d+/.test(params["age"])) fetchParams["age"] = params["age"]; + + this.searchParams.set(fetchParams); + return this.onFetch(0, 20, fetchParams); + }) + ) + .subscribe(members => { + this.membersUIInfoService.applyQueryParams(members); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Обработчик события прокрутки для бесконечной прокрутки + * + * @returns Observable с дополнительными участниками или пустой объект + */ + private onScroll(target: HTMLElement, membersRoot: ElementRef) { + // Проверяем, есть ли еще участники для загрузки + const total = this.membersUIInfoService.membersTotalCount(); + + if (total !== undefined && this.membersUIInfoService.members().length >= total) { + return EMPTY; + } + + if (!target || !membersRoot?.nativeElement) return EMPTY; + + // Вычисляем, достиг ли пользователь конца списка + const diff = + target.scrollTop - + membersRoot.nativeElement.getBoundingClientRect().height + + window.innerHeight; + + if (diff > 0) { + // Загружаем следующую порцию участников + return this.onFetch(this.members().length, this.membersTake(), this.searchParams()).pipe( + tap(membersChunk => { + this.membersUIInfoService.applyMembersChunk(membersChunk); + }) + ); + } + + return EMPTY; + } + + initScroll(target: HTMLElement, membersRoot: ElementRef): void { + fromEvent(target, "scroll") + .pipe( + throttleTime(500), + concatMap(() => this.onScroll(target, membersRoot)), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + /** + * Сохраняет значение элемента формы в URL параметрах + * + * @param control - Элемент управления формы + * @param queryName - Имя параметра в URL + */ + private saveControlValue(control: AbstractControl | null, queryName: string): void { + if (!control) return; + + control.valueChanges + .pipe(throttleTime(300), distinctUntilChanged(), takeUntil(this.destroy$)) + .subscribe(value => { + this.router + .navigate([], { + queryParams: { [queryName]: value.toString() }, + relativeTo: this.route, + queryParamsHandling: "merge", + }) + .then(() => console.debug("QueryParams changed from MembersComponent")); + }); + } + + /** + * Выполняет запрос на получение участников с заданными параметрами + * + * @param skip - Количество записей для пропуска (для пагинации) + * @param take - Количество записей для получения + * @param params - Дополнительные параметры фильтрации + * @returns Observable - Массив участников + */ + private onFetch(skip: number, take: number, params?: Record) { + return this.memberService.getMembers(skip, take, params).pipe( + takeUntil(this.destroy$), + tap(members => { + this.membersUIInfoService.applyMembersPagination(members); + }) + ); + } + + redirectToProfile(): void { + this.navigationService.profileRedirect(this.profileId()); + } +} diff --git a/projects/social_platform/src/app/api/member/facades/ui/members-ui-info.service.ts b/projects/social_platform/src/app/api/member/facades/ui/members-ui-info.service.ts new file mode 100644 index 00000000..d226cc7d --- /dev/null +++ b/projects/social_platform/src/app/api/member/facades/ui/members-ui-info.service.ts @@ -0,0 +1,53 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, Validators } from "@angular/forms"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; + +@Injectable() +export class MembersUIInfoService { + private readonly fb = inject(FormBuilder); + + readonly membersTotalCount = signal(undefined); // Общее количество участников + readonly membersTake = signal(20); // Количество участников на странице + private readonly membersPage = signal(1); // Текущая страница для пагинации + + readonly profileId = signal(undefined); + + readonly members = signal([]); // Массив участников для отображения + + // Форма поиска с обязательным полем для ввода имени + readonly searchForm = this.fb.group({ + search: ["", [Validators.required]], + }); + + // Форма фильтрации с полями для различных критериев + readonly filterForm = this.fb.group({ + keySkill: ["", Validators.required], // Ключевой навык + speciality: ["", Validators.required], // Специальность + age: [[null, null]], // Диапазон возраста [от, до] + isMosPolytechStudent: [false], // Является ли студентом МосПолитеха + }); + + applyProfileId(user: User): void { + this.profileId.set(user.id); + } + + applyMembersPagination(members: ApiPagination) { + this.membersTotalCount.set(members.count); + this.members.set(members.results); + } + + applyQueryParams(members: ApiPagination): void { + this.members.set(members.results || []); + this.membersTotalCount.set(members.count); + this.membersPage.set(1); + } + + applyMembersChunk(membersChunk: ApiPagination): void { + this.membersPage.update(page => page + 1); + this.members.update(list => [...list, ...(membersChunk.results || [])]); + this.membersTotalCount.set(membersChunk.count); + } +} diff --git a/projects/social_platform/src/app/api/news/news-info.service.ts b/projects/social_platform/src/app/api/news/news-info.service.ts new file mode 100644 index 00000000..9862d32b --- /dev/null +++ b/projects/social_platform/src/app/api/news/news-info.service.ts @@ -0,0 +1,51 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { FeedNews } from "../../domain/project/project-news.model"; +import { ApiPagination } from "../../domain/other/api-pagination.model"; + +@Injectable({ providedIn: "root" }) +export class NewsInfoService { + readonly news = signal([]); // Массив новостей + + applySetNews( + news: + | ApiPagination + | { + results: never[]; + count: number; + } + ): void { + this.news.set(news.results); + } + + applyAddNews(newsRes: any): void { + this.news.update(list => [newsRes, ...list]); + } + + applyUpdateNews(results: FeedNews[]): void { + this.news.update(news => [...news, ...results]); + } + + applyDeleteNews(newsId: number): void { + this.news.update(news => news.filter(n => n.id !== newsId)); + } + + applyEditNews(resNews: any): void { + this.news.update(news => news.map(n => (n.id === resNews.id ? resNews : n))); + } + + applyLikeNews(newsId: number): void { + this.news.update(list => + list.map(n => + n.id === newsId + ? { + ...n, + isUserLiked: !n.isUserLiked, + likesCount: n.isUserLiked ? n.likesCount - 1 : n.likesCount + 1, + } + : n + ) + ); + } +} diff --git a/projects/social_platform/src/app/api/office/facades/office-info.service.ts b/projects/social_platform/src/app/api/office/facades/office-info.service.ts new file mode 100644 index 00000000..f423f7b3 --- /dev/null +++ b/projects/social_platform/src/app/api/office/facades/office-info.service.ts @@ -0,0 +1,145 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { map, Subject, takeUntil } from "rxjs"; +import { IndustryService } from "../../industry/industry.service"; +import { ActivatedRoute, Router } from "@angular/router"; +import { AuthService } from "../../auth"; +import { InviteService } from "../../invite/invite.service"; +import { ChatService } from "../../chat/chat.service"; +import { Invite } from "../../../domain/invite/invite.model"; +import { OfficeUIInfoService } from "./ui/office-ui-info.service"; + +@Injectable() +export class OfficeInfoService { + private readonly industryService = inject(IndustryService); + private readonly route = inject(ActivatedRoute); + private readonly authService = inject(AuthService); + private readonly inviteService = inject(InviteService); + private readonly router = inject(Router); + private readonly chatService = inject(ChatService); + private readonly officeUIInfoService = inject(OfficeUIInfoService); + + readonly invites = this.officeUIInfoService.invites; + + private readonly destroy$ = new Subject(); + + initializationOffice(): void { + this.industryService.getAll().pipe(takeUntil(this.destroy$)).subscribe(); + + this.initializationNavItems(); + + this.initializationInvites(); + + this.initializationStatus(); + + if (!this.router.url.includes("chats")) { + this.chatService + .hasUnreads() + .pipe(takeUntil(this.destroy$)) + .subscribe(unreads => { + this.chatService.unread$.next(unreads); + }); + } + + this.officeUIInfoService.applyVerificationModal(); + } + + private initializationNavItems(): void { + this.authService.profile.pipe(takeUntil(this.destroy$)).subscribe(profile => { + this.officeUIInfoService.applyCreateNavItems(profile.id); + + if (!profile?.doesCompleted()) { + this.router + .navigateByUrl("/office/onboarding") + .then(() => console.debug("Route changed from OfficeComponent")); + } else if ( + profile?.verificationDate === null && + localStorage.getItem("waitVerificationAccepted") !== "true" + ) { + this.officeUIInfoService.applyOpenVerificationModal(); + } + }); + } + + private initializationStatus(): void { + this.chatService.connect().pipe(takeUntil(this.destroy$)).subscribe(); + + this.chatService + .onSetOffline() + .pipe(takeUntil(this.destroy$)) + .subscribe(evt => { + this.chatService.setOnlineStatus(evt.userId, false); + }); + + this.chatService + .onSetOnline() + .pipe(takeUntil(this.destroy$)) + .subscribe(evt => { + this.chatService.setOnlineStatus(evt.userId, true); + }); + } + + private initializationInvites(): void { + this.route.data + .pipe( + map(r => r["invites"]), + map(invites => invites.filter((invite: Invite) => invite.isAccepted === null)), + takeUntil(this.destroy$) + ) + .subscribe(invites => { + this.officeUIInfoService.applySetInvites(invites); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + onRejectInvite(inviteId: number): void { + this.inviteService + .rejectInvite(inviteId) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => { + this.invites.update(invites => invites.filter(invite => invite.id !== inviteId)); + }, + error: () => { + this.officeUIInfoService.applyOpenInviteErrorModal(); + }, + }); + } + + onAcceptInvite(inviteId: number): void { + const invite = this.invites().find(i => i.id === inviteId); + if (!invite) return; + + this.inviteService + .acceptInvite(inviteId) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => { + this.invites.update(invites => invites.filter(invite => invite.id !== inviteId)); + + this.router + .navigateByUrl(`/office/projects/${invite.project.id}`) + .then(() => console.debug("Route changed from SidebarComponent")); + }, + error: () => { + this.officeUIInfoService.applyOpenInviteErrorModal(); + }, + }); + } + + onLogout() { + this.authService + .logout() + .pipe(takeUntil(this.destroy$)) + .subscribe(() => + this.router + .navigateByUrl("/auth") + .then(() => console.debug("Route changed from OfficeComponent")) + ); + } +} diff --git a/projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts b/projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts new file mode 100644 index 00000000..2e4e1829 --- /dev/null +++ b/projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts @@ -0,0 +1,60 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; + +@Injectable() +export class OfficeUIInfoService { + readonly invites = signal([]); + + readonly waitVerificationModal = signal(false); + readonly waitVerificationAccepted = signal(false); + readonly inviteErrorModal = signal(false); + + readonly navItems = signal< + { name: string; link: string; icon: string; isExternal?: boolean; isActive?: boolean }[] + >([]); + + applyVerificationModal(): void { + // Не показываем модалку, если пользователь уже принял подтверждение + if (localStorage.getItem("waitVerificationAccepted") === "true") { + return; + } + } + + applyOpenVerificationModal(): void { + this.waitVerificationModal.set(true); + } + + applyOpenInviteErrorModal(): void { + this.inviteErrorModal.set(true); + } + + applyAcceptWaitVerification() { + this.waitVerificationAccepted.set(true); + localStorage.setItem("waitVerificationAccepted", "true"); + } + + applySetInvites(invites: any): void { + this.invites.set(invites); + } + + applyCreateNavItems(profileId: number): void { + this.navItems.set([ + { name: "мой профиль", icon: "person", link: `profile/${profileId}` }, + { name: "новости", icon: "feed", link: "feed" }, + { name: "проекты", icon: "projects", link: "projects" }, + { name: "участники", icon: "people-bold", link: "members" }, + { name: "программы", icon: "program", link: "program" }, + { name: "вакансии", icon: "search-sidebar", link: "vacancies" }, + { + name: "траектории", + icon: "trajectories", + link: "skills", + isExternal: true, + isActive: false, + }, + { name: "чаты", icon: "message", link: "chats" }, + ]); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/onboarding-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/onboarding-info.service.ts new file mode 100644 index 00000000..81bd3b9d --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/onboarding-info.service.ts @@ -0,0 +1,61 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { Subject, takeUntil } from "rxjs"; +import { OnboardingService } from "../onboarding.service"; + +@Injectable() +export class OnboardingInfoService { + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly onboardingService = inject(OnboardingService); + + readonly stage = signal(0); + readonly activeStage = signal(0); + + private readonly destroy$ = new Subject(); + + initializationOnboarding(): void { + this.onboardingService.currentStage$.pipe(takeUntil(this.destroy$)).subscribe(s => { + if (s === null) { + this.router + .navigateByUrl("/office") + .then(() => console.debug("Route changed from OnboardingComponent")); + return; + } + + if (this.router.url.includes("stage")) { + this.stage.set(Number.parseInt(this.router.url.split("-")[1])); + } else { + this.stage.set(s); + } + + this.router + .navigate([`stage-${this.stage()}`], { relativeTo: this.route }) + .then(() => console.debug("Route changed from OnboardingComponent")); + }); + + this.updateStage(); + + this.router.events.pipe(takeUntil(this.destroy$)).subscribe(this.updateStage.bind(this)); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + updateStage(): void { + this.activeStage.set(Number.parseInt(this.router.url.split("-")[1])); + this.stage.set(Number.parseInt(this.router.url.split("-")[1])); + } + + goToStep(stage: number): void { + if (this.stage() < stage) return; + + this.router + .navigate([`stage-${stage}`], { relativeTo: this.route }) + .then(() => console.debug("Route changed from OnboardingComponent")); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-one-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-one-info.service.ts new file mode 100644 index 00000000..6a21d99b --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-one-info.service.ts @@ -0,0 +1,97 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { Specialization } from "projects/social_platform/src/app/domain/specializations/specialization"; +import { concatMap, Subject, take, takeUntil } from "rxjs"; +import { AuthService } from "../../../auth"; +import { OnboardingService } from "../../onboarding.service"; +import { ValidationService } from "@corelib"; +import { Router } from "@angular/router"; +import { SearchesService } from "../../../searches/searches.service"; +import { OnboardingStageOneUIInfoService } from "./ui/onboarding-stage-one-ui-info.service"; +import { OnboardingUIInfoService } from "./ui/onboarding-ui-info.service"; + +@Injectable() +export class OnboardingStageOneInfoService { + private readonly authService = inject(AuthService); + private readonly onboardingService = inject(OnboardingService); + private readonly onboardingUIInfoService = inject(OnboardingUIInfoService); + private readonly validationService = inject(ValidationService); + private readonly router = inject(Router); + private readonly onboardingStageOneUIInfoService = inject(OnboardingStageOneUIInfoService); + private readonly searchesService = inject(SearchesService); + + private readonly destroy$ = new Subject(); + + private stageForm = this.onboardingStageOneUIInfoService.stageForm; + + private readonly stageSubmitting = this.onboardingUIInfoService.stageSubmitting; + private readonly skipSubmitting = this.onboardingUIInfoService.skipSubmitting; + + readonly inlineSpecializations = this.searchesService.inlineSpecs; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + initializationFormValues(): void { + this.onboardingService.formValue$.pipe(take(1), takeUntil(this.destroy$)).subscribe(fv => { + this.onboardingStageOneUIInfoService.applyInitFormValues(fv); + }); + + this.stageForm.valueChanges.pipe(takeUntil(this.destroy$)).subscribe(value => { + this.onboardingService.setFormValue(value); + }); + } + + initializationSpeciality(): void { + this.onboardingService.formValue$.pipe(takeUntil(this.destroy$)).subscribe(fv => { + this.onboardingStageOneUIInfoService.applyInitSpeciality(fv); + }); + } + + onSkipRegistration(): void { + if (!this.validationService.getFormValidation(this.stageForm)) { + return; + } + + this.completeRegistration(3); + } + + onSubmit(): void { + if (!this.validationService.getFormValidation(this.stageForm)) { + return; + } + + this.stageSubmitting.set(true); + + this.authService + .saveProfile(this.stageForm.value) + .pipe( + concatMap(() => this.authService.setOnboardingStage(2)), + takeUntil(this.destroy$) + ) + .subscribe({ + next: () => this.completeRegistration(2), + error: () => this.stageSubmitting.set(false), + }); + } + + onSelectSpec(speciality: Specialization): void { + this.searchesService.onSelectSpec(this.stageForm, speciality); + } + + onSearchSpec(query: string): void { + this.searchesService.onSearchSpec(query); + } + + private completeRegistration(stage: number): void { + this.skipSubmitting.set(true); + this.onboardingService.setFormValue(this.stageForm.value); + this.router.navigateByUrl( + stage === 2 ? `/office/onboarding/stage-${stage}` : "/office/onboarding/stage-3" + ); + this.skipSubmitting.set(false); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-three-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-three-info.service.ts new file mode 100644 index 00000000..f8ce43a9 --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-three-info.service.ts @@ -0,0 +1,57 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { concatMap, Subject, take, takeUntil } from "rxjs"; +import { OnboardingService } from "../../onboarding.service"; +import { AuthService } from "../../../auth"; +import { Router } from "@angular/router"; +import { OnboardingUIInfoService } from "./ui/onboarding-ui-info.service"; +import { OnboardingStageThreeUIInfoService } from "./ui/onboarding-stage-three-ui-info.service"; + +@Injectable() +export class OnboardingStageThreeInfoService { + private readonly onboardingService = inject(OnboardingService); + private readonly onboardingUIInfoService = inject(OnboardingUIInfoService); + private readonly onboardingStageThreeUIInfoService = inject(OnboardingStageThreeUIInfoService); + private readonly authService = inject(AuthService); + private readonly router = inject(Router); + + private readonly destroy$ = new Subject(); + + private readonly userRole = this.onboardingStageThreeUIInfoService.userRole; + + private readonly stageTouched = this.onboardingUIInfoService.stageTouched; + private readonly stageSubmitting = this.onboardingUIInfoService.stageSubmitting; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + initializationFormValues(): void { + this.onboardingService.formValue$.pipe(take(1), takeUntil(this.destroy$)).subscribe(fv => { + this.onboardingStageThreeUIInfoService.applyInitFormValues(fv); + }); + } + + onSubmit() { + if (this.userRole() === -1) { + this.stageTouched.set(true); + return; + } + + this.stageSubmitting.set(true); + + this.authService + .saveProfile({ userType: this.userRole() }) + .pipe( + concatMap(() => this.authService.setOnboardingStage(null)), + takeUntil(this.destroy$) + ) + .subscribe(() => { + this.router + .navigateByUrl("/office") + .then(() => console.debug("Route changed from OnboardingStageTwo")); + }); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-two-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-two-info.service.ts new file mode 100644 index 00000000..bf416e63 --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-two-info.service.ts @@ -0,0 +1,114 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { Router } from "@angular/router"; +import { concatMap, Subject, take, takeUntil } from "rxjs"; +import { ValidationService } from "@corelib"; +import { AuthService } from "../../../auth"; +import { OnboardingService } from "../../onboarding.service"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; +import { SkillsInfoService } from "../../../skills/facades/skills-info.service"; +import { OnboardingUIInfoService } from "./ui/onboarding-ui-info.service"; +import { OnboardingStageTwoUIInfoService } from "./ui/onboarding-stage-two-ui-info.service"; + +@Injectable() +export class OnboardingStageTwoInfoService { + private readonly authService = inject(AuthService); + private readonly onboardingService = inject(OnboardingService); + private readonly onboardingUIInfoService = inject(OnboardingUIInfoService); + private readonly onboardingStageTwoUIInfoService = inject(OnboardingStageTwoUIInfoService); + private readonly validationService = inject(ValidationService); + private readonly router = inject(Router); + private readonly skillsInfoService = inject(SkillsInfoService); + + private readonly destroy$ = new Subject(); + + private readonly stageForm = this.onboardingStageTwoUIInfoService.stageForm; + + private readonly stageSubmitting = this.onboardingUIInfoService.stageSubmitting; + private readonly skipSubmitting = this.onboardingUIInfoService.skipSubmitting; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + initializationFormValues(): void { + this.onboardingService.formValue$ + .pipe(take(1), takeUntil(this.destroy$)) + .subscribe(({ skills }) => this.onboardingStageTwoUIInfoService.applyInitFormValues(skills)); + + this.stageForm.valueChanges.pipe(takeUntil(this.destroy$)).subscribe(value => { + this.onboardingService.setFormValue(value); + }); + } + + initializationSkills(): void { + this.onboardingService.formValue$.pipe(takeUntil(this.destroy$)).subscribe(fv => { + this.onboardingStageTwoUIInfoService.applyInitSkills(fv); + }); + } + + onSkipRegistration(): void { + if (!this.validationService.getFormValidation(this.stageForm)) { + return; + } + + this.completeRegistration(3); + } + + onSubmit(): void { + if (!this.validationService.getFormValidation(this.stageForm)) { + return; + } + + this.stageSubmitting.set(true); + + const { skills } = this.stageForm.getRawValue(); + + this.authService + .saveProfile({ skillsIds: skills.map((skill: Skill) => skill.id) }) + .pipe( + concatMap(() => this.authService.setOnboardingStage(2)), + takeUntil(this.destroy$) + ) + .subscribe({ + next: () => this.completeRegistration(3), + error: err => { + this.stageSubmitting.set(false); + this.onboardingStageTwoUIInfoService.applySubmitErrorModal(err); + }, + }); + } + + onAddSkill(newSkill: Skill): void { + this.skillsInfoService.onAddSkill(newSkill, this.stageForm); + } + + onRemoveSkill(oddSkill: Skill): void { + this.skillsInfoService.onRemoveSkill(oddSkill, this.stageForm); + } + + onOptionToggled(toggledSkill: Skill): void { + const { skills } = this.stageForm.getRawValue(); + + const isPresent = skills.some((skill: Skill) => skill.id === toggledSkill.id); + + if (isPresent) { + this.onRemoveSkill(toggledSkill); + } else { + this.onAddSkill(toggledSkill); + } + } + + onSearchSkill(query: string): void { + this.skillsInfoService.onSearchSkill(query); + } + + private completeRegistration(stage: number): void { + this.skipSubmitting.set(true); + this.onboardingService.setFormValue(this.stageForm.value); + this.router.navigateByUrl(`/office/onboarding/stage-${stage}`); + this.skipSubmitting.set(false); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-zero-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-zero-info.service.ts new file mode 100644 index 00000000..6b399b3a --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/onboarding-stage-zero-info.service.ts @@ -0,0 +1,121 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { concatMap, Subject, takeUntil } from "rxjs"; +import { OnboardingService } from "../../onboarding.service"; +import { ValidationService } from "@corelib"; +import { Router } from "@angular/router"; +import { AuthService } from "../../../auth"; +import { OnboardingStageZeroUIInfoService } from "./ui/onboarding-stage-zero-ui-info.service"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { OnboardingUIInfoService } from "./ui/onboarding-ui-info.service"; + +@Injectable() +export class OnboardingStageZeroInfoService { + private readonly onboardingService = inject(OnboardingService); + private readonly onboardingUIInfoService = inject(OnboardingUIInfoService); + private readonly onboardingStageZeroUIInfoService = inject(OnboardingStageZeroUIInfoService); + private readonly validationService = inject(ValidationService); + private readonly authService = inject(AuthService); + private readonly router = inject(Router); + + private readonly destroy$ = new Subject(); + + private readonly stageForm = this.onboardingStageZeroUIInfoService.stageForm; + private readonly achievements = this.onboardingStageZeroUIInfoService.achievements; + private readonly education = this.onboardingStageZeroUIInfoService.education; + private readonly workExperience = this.onboardingStageZeroUIInfoService.workExperience; + private readonly userLanguages = this.onboardingStageZeroUIInfoService.userLanguages; + + private readonly stageSubmitting = this.onboardingUIInfoService.stageSubmitting; + private readonly skipSubmitting = this.onboardingUIInfoService.skipSubmitting; + + initializationStageZero(): void { + this.authService.profile.pipe(takeUntil(this.destroy$)).subscribe(p => { + this.onboardingStageZeroUIInfoService.applySetProfile(p); + }); + + this.onboardingService.formValue$.pipe(takeUntil(this.destroy$)).subscribe(fv => { + this.onboardingStageZeroUIInfoService.applyInitStageZero(fv); + }); + } + + initializationFormValues(): void { + this.onboardingService.formValue$.pipe(takeUntil(this.destroy$)).subscribe(formValues => { + this.onboardingStageZeroUIInfoService.applyInitFormValues(formValues); + + this.onboardingStageZeroUIInfoService.applyInitWorkExperience(formValues); + this.onboardingStageZeroUIInfoService.applyInitEducation(formValues); + this.onboardingStageZeroUIInfoService.applyInitUserLanguages(formValues); + this.onboardingStageZeroUIInfoService.applyInitAchievements(formValues); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + onSkipRegistration(): void { + if (!this.validationService.getFormValidation(this.stageForm)) { + return; + } + + const onboardingSkipInfo = { + avatar: this.stageForm.get("avatar")?.value, + city: this.stageForm.get("city")?.value, + }; + + this.skipSubmitting.set(true); + this.authService + .saveProfile(onboardingSkipInfo as Partial) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => this.completeRegistration(3), + error: error => { + this.skipSubmitting.set(false); + this.onboardingStageZeroUIInfoService.applySkipRegistrationModalError(error); + }, + }); + } + + onSubmit(): void { + if (!this.validationService.getFormValidation(this.stageForm)) { + this.achievements.markAllAsTouched(); + return; + } + + const newStageForm = { + avatar: this.stageForm.get("avatar")?.value, + city: this.stageForm.get("city")?.value, + education: this.education.value, + workExperience: this.workExperience.value, + userLanguages: this.userLanguages.value, + achievements: this.achievements.value, + }; + + this.stageSubmitting.set(true); + this.authService + .saveProfile(newStageForm as Partial) + .pipe( + concatMap(() => this.authService.setOnboardingStage(1)), + takeUntil(this.destroy$) + ) + .subscribe({ + next: () => this.completeRegistration(1), + error: error => { + this.stageSubmitting.set(false); + this.onboardingStageZeroUIInfoService.applySubmitModalError(error); + }, + }); + } + + private completeRegistration(stage: number): void { + this.skipSubmitting.set(true); + this.onboardingService.setFormValue(this.stageForm.value as Partial); + this.router.navigateByUrl( + stage === 1 ? "/office/onboarding/stage-1" : "/office/onboarding/stage-3" + ); + this.skipSubmitting.set(false); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-one-ui-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-one-ui-info.service.ts new file mode 100644 index 00000000..788f00d6 --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-one-ui-info.service.ts @@ -0,0 +1,51 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { NonNullableFormBuilder } from "@angular/forms"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; + +@Injectable() +export class OnboardingStageOneUIInfoService { + private readonly nnFb = inject(NonNullableFormBuilder); + + // Для управления открытыми группами специализаций + readonly openSpecializationGroup = signal(null); + + readonly stageForm = this.nnFb.group({ + speciality: [""], + }); + + /** + * Проверяет, есть ли открытые группы специализаций + */ + hasOpenSpecializationsGroups(): boolean { + return this.openSpecializationGroup() !== null; + } + + /** + * Обработчик переключения группы специализаций + * @param isOpen - флаг открытия/закрытия группы + * @param groupName - название группы + */ + onSpecializationsGroupToggled(isOpen: boolean, groupName: string): void { + this.openSpecializationGroup.set(isOpen ? groupName : null); + } + + /** + * Проверяет, должна ли группа специализаций быть отключена + * @param groupName - название группы для проверки + */ + isSpecializationGroupDisabled(groupName: string): boolean { + return this.openSpecializationGroup() !== null && this.openSpecializationGroup() !== groupName; + } + + applyInitFormValues(fv: Partial): void { + this.stageForm.patchValue({ + speciality: fv.speciality, + }); + } + + applyInitSpeciality(fv: Partial): void { + this.stageForm.patchValue({ speciality: fv.speciality }); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-three-ui-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-three-ui-info.service.ts new file mode 100644 index 00000000..4e8f84f8 --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-three-ui-info.service.ts @@ -0,0 +1,21 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { OnboardingService } from "../../../onboarding.service"; + +@Injectable() +export class OnboardingStageThreeUIInfoService { + private readonly onboardingService = inject(OnboardingService); + + readonly userRole = signal(-1); + + applyInitFormValues(fv: Partial): void { + this.userRole.set(fv.userType ? fv.userType : -1); + } + + applySetRole(role: number) { + this.userRole.set(role); + this.onboardingService.setFormValue({ userType: role }); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-two-ui-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-two-ui-info.service.ts new file mode 100644 index 00000000..6098f8d2 --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-two-ui-info.service.ts @@ -0,0 +1,61 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { NonNullableFormBuilder } from "@angular/forms"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; + +@Injectable() +export class OnboardingStageTwoUIInfoService { + private readonly nnFb = inject(NonNullableFormBuilder); + + readonly isChooseSkill = signal(false); + readonly isChooseSkillText = signal(""); + + readonly searchedSkills = signal([]); + + readonly openSkillGroup = signal(null); + + readonly stageForm = this.nnFb.group({ + skills: this.nnFb.control([]), + }); + + /** + * Проверяет, есть ли открытые группы навыков + */ + hasOpenSkillsGroups(): boolean { + return this.openSkillGroup() !== null; + } + + /** + * Обработчик переключения группы навыков + * @param skillName - название навыка + * @param isOpen - флаг открытия/закрытия группы + */ + onSkillGroupToggled(isOpen: boolean, skillName: string): void { + this.openSkillGroup.set(isOpen ? skillName : null); + } + + /** + * Проверяет, должна ли группа навыков быть отключена + * @param skillName - название навыка + */ + isSkillGroupDisabled(skillName: string): boolean { + return this.openSkillGroup() !== null && this.openSkillGroup() !== skillName; + } + + applyInitFormValues(skills: Skill[] | undefined): void { + this.stageForm.patchValue({ skills: skills ?? [] }); + } + + applyInitSkills(fv: Partial): void { + this.stageForm.patchValue({ skills: fv.skills }); + } + + applySubmitErrorModal(err: any): void { + if (err.status === 400) { + this.isChooseSkill.set(true); + this.isChooseSkillText.set(err.error[0]); + } + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-zero-ui-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-zero-ui-info.service.ts new file mode 100644 index 00000000..3cd9a814 --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-stage-zero-ui-info.service.ts @@ -0,0 +1,517 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormArray, FormBuilder, Validators } from "@angular/forms"; +import { generateOptionsList } from "@utils/generate-options-list"; +import { transformYearStringToNumber } from "@utils/helpers/transformYear"; +import { yearRangeValidators } from "@utils/helpers/yearRangeValidators"; +import { + educationUserLevel, + educationUserType, +} from "projects/core/src/consts/lists/education-info-list.const"; +import { + languageLevelsList, + languageNamesList, +} from "projects/core/src/consts/lists/language-info-list.const"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { OnboardingUIInfoService } from "./onboarding-ui-info.service"; + +@Injectable() +export class OnboardingStageZeroUIInfoService { + private readonly fb = inject(FormBuilder); + private readonly onboardingUIInfoService = inject(OnboardingUIInfoService); + + readonly profile = signal(undefined); + + readonly educationItems = signal([]); + readonly workItems = signal([]); + readonly languageItems = signal([]); + + readonly editIndex = signal(null); + readonly editEducationClick = signal(false); + readonly editWorkClick = signal(false); + readonly editLanguageClick = signal(false); + + readonly selectedEntryYearEducationId = signal(undefined); + readonly selectedComplitionYearEducationId = signal(undefined); + readonly selectedEducationStatusId = signal(undefined); + readonly selectedEducationLevelId = signal(undefined); + + readonly selectedEntryYearWorkId = signal(undefined); + readonly selectedComplitionYearWorkId = signal(undefined); + + readonly selectedLanguageId = signal(undefined); + readonly selectedLanguageLevelId = signal(undefined); + + readonly isModalErrorYear = signal(false); + readonly isModalErrorYearText = signal(""); + + readonly yearListEducation = generateOptionsList(55, "years"); + readonly educationStatusList = educationUserType; + readonly educationLevelList = educationUserLevel; + + readonly languageList = languageNamesList; + readonly languageLevelList = languageLevelsList; + + readonly stageForm = this.fb.nonNullable.group({ + avatar: ["", [Validators.required]], + city: ["", [Validators.required]], + + education: this.fb.array([]), + workExperience: this.fb.array([]), + userLanguages: this.fb.array([]), + achievements: this.fb.array([]), + + // education + organizationName: [""], + entryYear: [null], + completionYear: [null], + description: [null], + educationStatus: [null], + educationLevel: [null], + + // work + organizationNameWork: [""], + entryYearWork: [null], + completionYearWork: [null], + descriptionWork: [null], + jobPosition: [null], + + // language + language: [null], + languageLevel: [null], + }); + + readonly achievements = this.stageForm.get("achievements") as FormArray; + readonly education = this.stageForm.get("education") as FormArray; + readonly workExperience = this.stageForm.get("workExperience") as FormArray; + readonly userLanguages = this.stageForm.get("userLanguages") as FormArray; + + applySetProfile(p: User): void { + this.profile.set(p); + } + + applyInitStageZero(fv: Partial): void { + this.stageForm.patchValue({ + avatar: fv.avatar, + city: fv.city, + education: fv.education, + workExperience: fv.workExperience, + }); + } + + applyInitFormValues(fv: Partial): void { + this.stageForm.patchValue({ + avatar: fv.avatar ?? "", + city: fv.city ?? "", + }); + } + + applyInitWorkExperience(formValues: Partial): void { + this.workExperience.clear(); + formValues.workExperience?.forEach(work => { + this.workExperience.push( + this.fb.group( + { + organizationName: work.organizationName, + entryYear: work.entryYear, + completionYear: work.completionYear, + description: work.description, + jobPosition: work.jobPosition, + }, + { + validators: yearRangeValidators("entryYear", "completionYear"), + } + ) + ); + }); + } + + applyInitEducation(formValues: Partial): void { + this.education.clear(); + formValues?.education?.forEach(edu => { + this.education.push( + this.fb.group( + { + organizationName: edu.organizationName, + entryYear: edu.entryYear, + completionYear: edu.completionYear, + description: edu.description, + educationStatus: edu.educationStatus, + educationLevel: edu.educationLevel, + }, + { + validators: yearRangeValidators("entryYear", "completionYear"), + } + ) + ); + }); + } + + applyInitUserLanguages(formValues: Partial): void { + this.userLanguages.clear(); + formValues.userLanguages?.forEach(lang => { + this.userLanguages.push( + this.fb.group({ + language: lang.language, + languageLevel: lang.languageLevel, + }) + ); + }); + } + + applyInitAchievements(formValues: Partial): void { + formValues.achievements?.length && + formValues.achievements?.forEach(achievement => + this.addAchievement(achievement.id, achievement.title, achievement.status) + ); + } + + addEducation() { + ["organizationName", "educationStatus"].forEach(name => + this.stageForm.get(name)?.clearValidators() + ); + ["organizationName", "educationStatus"].forEach(name => + this.stageForm.get(name)?.setValidators([Validators.required]) + ); + ["organizationName", "educationStatus"].forEach(name => + this.stageForm.get(name)?.updateValueAndValidity() + ); + ["organizationName", "educationStatus"].forEach(name => + this.stageForm.get(name)?.markAsTouched() + ); + + const valEntry = this.stageForm.get("entryYear")?.value as string | null; + const entryYear = typeof valEntry === "string" ? +valEntry.slice(0, 5) : valEntry; + + const valCompletion = this.stageForm.get("completionYear")?.value as string | null; + const completionYear = + typeof valCompletion === "string" ? +valCompletion.slice(0, 5) : valCompletion; + + if (entryYear !== null && completionYear !== null && entryYear > completionYear) { + this.applyYearModalError(); + return; + } + + const educationItem = this.fb.group({ + organizationName: this.stageForm.get("organizationName")?.value, + entryYear, + completionYear, + description: this.stageForm.get("description")?.value, + educationStatus: this.stageForm.get("educationStatus")?.value, + educationLevel: this.stageForm.get("educationLevel")?.value, + }); + + const isOrganizationValid = this.stageForm.get("organizationName")?.valid; + const isStatusValid = this.stageForm.get("educationStatus")?.valid; + + if (isOrganizationValid && isStatusValid) { + if (this.editIndex() !== null) { + this.educationItems.update(items => { + const updatedItems = [...items]; + updatedItems[this.editIndex()!] = educationItem.value; + + this.education.at(this.editIndex()!).patchValue(educationItem.value); + return updatedItems; + }); + this.editIndex.set(null); + } else { + this.educationItems.update(items => [...items, educationItem.value]); + this.education.push(educationItem); + } + [ + "organizationName", + "entryYear", + "completionYear", + "description", + "educationStatus", + "educationLevel", + ].forEach(name => { + this.stageForm.get(name)?.reset(); + this.stageForm.get(name)?.setValue(""); + this.stageForm.get(name)?.clearValidators(); + this.stageForm.get(name)?.markAsPristine(); + this.stageForm.get(name)?.updateValueAndValidity(); + }); + } + this.editEducationClick.set(false); + } + + editEducation(index: number) { + this.editEducationClick.set(true); + const educationItem = this.education.value[index]; + + this.yearListEducation.forEach(entryYearWork => { + if (transformYearStringToNumber(entryYearWork.value as string) === educationItem.entryYear) { + this.selectedEntryYearEducationId.set(entryYearWork.id); + } + }); + + this.yearListEducation.forEach(completionYearWork => { + if ( + transformYearStringToNumber(completionYearWork.value as string) === + educationItem.completionYear + ) { + this.selectedComplitionYearEducationId.set(completionYearWork.id); + } + }); + + this.educationLevelList.forEach(educationLevel => { + if (educationLevel.value === educationItem.educationLevel) { + this.selectedEducationLevelId.set(educationLevel.id); + } + }); + + this.educationStatusList.forEach(educationStatus => { + if (educationStatus.value === educationItem.educationStatus) { + this.selectedEducationStatusId.set(educationStatus.id); + } + }); + + this.stageForm.patchValue({ + organizationName: educationItem.organizationName, + entryYear: educationItem.entryYear, + completionYear: educationItem.completionYear, + description: educationItem.description, + educationStatus: educationItem.educationStatus, + educationLevel: educationItem.educationLevel, + }); + this.editIndex.set(index); + } + + removeEducation(i: number) { + this.educationItems.update(items => items.filter((_, index) => index !== i)); + + this.education.removeAt(i); + } + + addWork() { + ["organizationNameWork", "jobPosition"].forEach(name => + this.stageForm.get(name)?.clearValidators() + ); + ["organizationNameWork", "jobPosition"].forEach(name => + this.stageForm.get(name)?.setValidators([Validators.required]) + ); + ["organizationNameWork", "jobPosition"].forEach(name => + this.stageForm.get(name)?.updateValueAndValidity() + ); + ["organizationNameWork", "jobPosition"].forEach(name => + this.stageForm.get(name)?.markAsTouched() + ); + + const valEntry = this.stageForm.get("entryYearWork")?.value as string | null; + const entryYear = typeof valEntry === "string" ? +valEntry.slice(0, 5) : valEntry; + + const valCompletion = this.stageForm.get("completionYearWork")?.value as string | null; + const completionYear = + typeof valCompletion === "string" ? +valCompletion.slice(0, 5) : valCompletion; + + if (entryYear !== null && completionYear !== null && entryYear > completionYear) { + this.isModalErrorYear.set(true); + this.isModalErrorYearText.set("Год начала работы должен быть меньше года окончания"); + return; + } + + const workItem = this.fb.group({ + organizationName: this.stageForm.get("organizationNameWork")?.value, + entryYear, + completionYear, + description: this.stageForm.get("descriptionWork")?.value, + jobPosition: this.stageForm.get("jobPosition")?.value, + }); + + const isOrganizationValid = this.stageForm.get("organizationNameWork")?.valid; + const isPositionValid = this.stageForm.get("jobPosition")?.valid; + + if (isOrganizationValid && isPositionValid) { + if (this.editIndex() !== null) { + this.workItems.update(items => { + const updatedItems = [...items]; + updatedItems[this.editIndex()!] = workItem.value; + + this.workExperience.at(this.editIndex()!).patchValue(workItem.value); + return updatedItems; + }); + this.editIndex.set(null); + } else { + this.workItems.update(items => [...items, workItem.value]); + this.workExperience.push(workItem); + } + [ + "organizationNameWork", + "entryYearWork", + "completionYearWork", + "descriptionWork", + "jobPosition", + ].forEach(name => { + this.stageForm.get(name)?.reset(); + this.stageForm.get(name)?.setValue(""); + this.stageForm.get(name)?.clearValidators(); + this.stageForm.get(name)?.markAsPristine(); + this.stageForm.get(name)?.updateValueAndValidity(); + }); + } + this.editWorkClick.set(false); + } + + editWork(index: number) { + this.editWorkClick.set(true); + const workItem = this.workExperience.value[index]; + + if (workItem) { + this.yearListEducation.forEach(entryYearWork => { + if ( + transformYearStringToNumber(entryYearWork.value as string) === workItem.entryYearWork || + transformYearStringToNumber(entryYearWork.value as string) === workItem.entryYear + ) { + this.selectedEntryYearWorkId.set(entryYearWork.id); + } + }); + + this.yearListEducation.forEach(complitionYearWork => { + if ( + transformYearStringToNumber(complitionYearWork.value as string) === + workItem.completionYearWork || + transformYearStringToNumber(complitionYearWork.value as string) === + workItem.completionYear + ) { + this.selectedComplitionYearWorkId.set(complitionYearWork.id); + } + }); + + this.stageForm.patchValue({ + organizationNameWork: workItem.organization || workItem.organizationName, + entryYearWork: workItem.entryYearWork || workItem.entryYear, + completionYearWork: workItem.completionYearWork || workItem.completionYear, + descriptionWork: workItem.descriptionWork || workItem.description, + jobPosition: workItem.jobPosition, + }); + this.editIndex.set(index); + } + } + + removeWork(i: number) { + this.workItems.update(items => items.filter((_, index) => index !== i)); + + this.workExperience.removeAt(i); + } + + addLanguage() { + const languageValue = this.stageForm.get("language")?.value; + const languageLevelValue = this.stageForm.get("languageLevel")?.value; + + ["language", "languageLevel"].forEach(name => { + this.stageForm.get(name)?.clearValidators(); + }); + + if ((languageValue && !languageLevelValue) || (!languageValue && languageLevelValue)) { + ["language", "languageLevel"].forEach(name => { + this.stageForm.get(name)?.setValidators([Validators.required]); + }); + } + + ["language", "languageLevel"].forEach(name => { + this.stageForm.get(name)?.updateValueAndValidity(); + this.stageForm.get(name)?.markAsTouched(); + }); + + const isLanguageValid = this.stageForm.get("language")?.valid; + const isLanguageLevelValid = this.stageForm.get("languageLevel")?.valid; + + if (!isLanguageValid || !isLanguageLevelValid) { + return; + } + + const languageItem = this.fb.group({ + language: languageValue, + languageLevel: languageLevelValue, + }); + + if (languageValue && languageLevelValue) { + if (this.editIndex() !== null) { + this.languageItems.update(items => { + const updatedItems = [...items]; + updatedItems[this.editIndex()!] = languageItem.value; + + this.userLanguages.at(this.editIndex()!).patchValue(languageItem.value); + return updatedItems; + }); + this.editIndex.set(null); + } else { + this.languageItems.update(items => [...items, languageItem.value]); + this.userLanguages.push(languageItem); + } + ["language", "languageLevel"].forEach(name => { + this.stageForm.get(name)?.reset(); + this.stageForm.get(name)?.setValue(null); + this.stageForm.get(name)?.clearValidators(); + this.stageForm.get(name)?.markAsPristine(); + this.stageForm.get(name)?.updateValueAndValidity(); + }); + + this.editLanguageClick.set(false); + } + } + + editLanguage(index: number) { + this.editLanguageClick.set(true); + const languageItem = this.userLanguages.value[index]; + + this.languageList.forEach(language => { + if (language.value === languageItem.language) { + this.selectedLanguageId.set(language.id); + } + }); + + this.languageLevelList.forEach(languageLevel => { + if (languageLevel.value === languageItem.languageLevel) { + this.selectedLanguageLevelId.set(languageLevel.id); + } + }); + + this.stageForm.patchValue({ + language: languageItem.language, + languageLevel: languageItem.languageLevel, + }); + + this.editIndex.set(index); + } + + removeLanguage(i: number) { + this.languageItems.update(items => items.filter((_, index) => index !== i)); + + this.userLanguages.removeAt(i); + } + + addAchievement(id?: number, title?: string, status?: string): void { + this.achievements.push( + this.fb.group({ + title: [title ?? "", [Validators.required]], + status: [status ?? "", [Validators.required]], + id: [id], + }) + ); + } + + removeAchievement(i: number): void { + this.achievements.removeAt(i); + } + + applyYearModalError(): void { + this.isModalErrorYear.set(true); + this.isModalErrorYearText.set("Год начала обучения должен быть меньше года окончания"); + } + + applySubmitModalError(error: any): void { + this.isModalErrorYear.set(true); + + if (error.error.language) { + this.isModalErrorYearText.set(error.error.language); + } + } + + applySkipRegistrationModalError(error: any): void { + this.isModalErrorYear.set(true); + this.isModalErrorYearText.set(error.error?.message || "Ошибка сохранения"); + } +} diff --git a/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-ui-info.service.ts b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-ui-info.service.ts new file mode 100644 index 00000000..403434cb --- /dev/null +++ b/projects/social_platform/src/app/api/onboarding/facades/stages/ui/onboarding-ui-info.service.ts @@ -0,0 +1,10 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; + +@Injectable() +export class OnboardingUIInfoService { + readonly stageSubmitting = signal(false); + readonly skipSubmitting = signal(false); + readonly stageTouched = signal(false); +} diff --git a/projects/social_platform/src/app/api/paths/navigation.service.ts b/projects/social_platform/src/app/api/paths/navigation.service.ts new file mode 100644 index 00000000..23840847 --- /dev/null +++ b/projects/social_platform/src/app/api/paths/navigation.service.ts @@ -0,0 +1,17 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { Router } from "@angular/router"; + +@Injectable({ providedIn: "root" }) +export class NavigationService { + private readonly router = inject(Router); + + profileRedirect(profileId?: number): void { + if (!profileId) return; + + this.router + .navigateByUrl(`/office/profile/${profileId}`) + .then(() => console.debug("Router Changed form ProfileEditComponent")); + } +} diff --git a/projects/social_platform/src/app/api/paths/paths.service.ts b/projects/social_platform/src/app/api/paths/paths.service.ts new file mode 100644 index 00000000..be979c5e --- /dev/null +++ b/projects/social_platform/src/app/api/paths/paths.service.ts @@ -0,0 +1,23 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { NavigationEnd, Router } from "@angular/router"; +import { filter } from "rxjs"; + +@Injectable({ providedIn: "root" }) +export class PathsService { + private readonly router = inject(Router); + + readonly basePath = signal("/office/"); + readonly url = signal(this.router.url); + + constructor() { + this.router.events.pipe(filter(e => e instanceof NavigationEnd)).subscribe(() => { + this.url.set(this.router.url); + }); + } + + readonly isAllVacanciesPage = computed(() => this.url().includes("/vacancies/all")); + + readonly isMyVacanciesPage = computed(() => this.url().includes("/vacancies/my")); +} diff --git a/projects/social_platform/src/app/api/profile/facades/detail/profile-detail-info.service.ts b/projects/social_platform/src/app/api/profile/facades/detail/profile-detail-info.service.ts new file mode 100644 index 00000000..d14c0b5f --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/detail/profile-detail-info.service.ts @@ -0,0 +1,185 @@ +/** @format */ + +import { ElementRef, inject, Injectable } from "@angular/core"; +import { concatMap, filter, map, Subject, takeUntil, tap } from "rxjs"; +import { ProfileNews } from "../../../../domain/profile/profile-news.model"; +import { ActivatedRoute } from "@angular/router"; +import { AuthService } from "../../../auth"; +import { ProfileNewsService } from "../../profile-news.service"; +import { ExpandService } from "../../../expand/expand.service"; +import { calculateProfileProgress } from "@utils/calculateProgress"; +import { ProfileDetailUIInfoService } from "./ui/profile-detail-ui-info.service"; +import { NewsInfoService } from "../../../news/news-info.service"; +import { ProjectsDetailUIInfoService } from "../../../project/facades/detail/ui/projects-detail-ui.service"; + +@Injectable() +export class ProfileDetailInfoService { + private readonly route = inject(ActivatedRoute); + private readonly authService = inject(AuthService); + private readonly profileNewsService = inject(ProfileNewsService); + private readonly expandService = inject(ExpandService); + private readonly profileDetailUIInfoService = inject(ProfileDetailUIInfoService); + private readonly projectsDetailUIInfoService = inject(ProjectsDetailUIInfoService); + private readonly newsInfoService = inject(NewsInfoService); + + private observer?: IntersectionObserver; + private readonly destroy$ = new Subject(); + + private readonly user = this.profileDetailUIInfoService.user; + private readonly news = this.newsInfoService.news; + + destroy(): void { + this.observer?.disconnect(); + this.destroy$.next(); + this.destroy$.complete(); + } + + initializationProfile(): void { + this.route.data + .pipe( + map(data => { + const user = data["data"]["user"]; + return { + ...data, + data: { + ...data["data"], + user: { + ...user, + progress: calculateProfileProgress(user), + }, + }, + }; + }), + filter(data => !!data["data"]["user"]), + takeUntil(this.destroy$) + ) + .subscribe({ + next: data => { + this.profileDetailUIInfoService.applyInitProfile(data); + }, + }); + + this.initializationProfileVields(); + this.initializationProfileNews(); + } + + initCheckDescription(descEl?: ElementRef): void { + setTimeout(() => { + this.expandService.checkExpandable("description", !!this.user()?.aboutMe, descEl); + }, 150); + } + + /** + * Добавление новой новости в профиль + * @param news - объект с текстом и файлами новости + */ + onAddNews(news: { text: string; files: string[] }) { + return this.profileNewsService.addNews(this.route.snapshot.params["id"], news).pipe( + tap(newsRes => { + this.newsInfoService.applyAddNews(newsRes); + }), + takeUntil(this.destroy$) + ); + } + + /** + * Удаление новости из профиля + * @param newsId - идентификатор удаляемой новости + */ + onDeleteNews(newsId: number): void { + this.newsInfoService.applyDeleteNews(newsId); + + this.profileNewsService + .delete(this.route.snapshot.params["id"], newsId) + .pipe(takeUntil(this.destroy$)) + .subscribe({ next: () => {} }); + } + + /** + * Переключение лайка новости + * @param newsId - идентификатор новости для лайка/дизлайка + */ + onLike(newsId: number) { + const item = this.news().find(n => n.id === newsId); + if (!item) return; + + this.profileNewsService + .toggleLike(this.route.snapshot.params["id"], newsId, !item.isUserLiked) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.newsInfoService.applyLikeNews(newsId); + }); + } + + /** + * Редактирование существующей новости + * @param news - обновленные данные новости + * @param newsItemId - идентификатор редактируемой новости + */ + onEditNews(news: ProfileNews, newsItemId: number) { + return this.profileNewsService + .editNews(this.route.snapshot.params["id"], newsItemId, news) + .pipe( + tap(resNews => { + this.newsInfoService.applyEditNews(resNews); + }) + ); + } + + /** + * Обработчик появления новостей в области видимости + * Отмечает новости как просмотренные при скролле + * @param entries - массив элементов, попавших в область видимости + */ + onNewsInView(entries: IntersectionObserverEntry[]): void { + const ids = entries.map(e => { + return Number((e.target as HTMLElement).dataset["id"]); + }); + + this.profileNewsService + .readNews(Number(this.route.snapshot.params["id"]), ids) + .pipe(takeUntil(this.destroy$)) + .subscribe(); + } + + private initializationProfileVields(): void { + this.authService.profile.pipe(takeUntil(this.destroy$)).subscribe({ + next: user => { + this.projectsDetailUIInfoService.applySetLoggedUserId("logged", user.id); + }, + }); + + this.profileDetailUIInfoService.applyProfileEmpty(); + } + + private initializationProfileNews(descEl?: ElementRef): void { + this.route.params + .pipe( + map(r => r["id"]), + concatMap(userId => this.profileNewsService.fetchNews(userId)), + takeUntil(this.destroy$) + ) + .subscribe(news => { + this.newsInfoService.applySetNews(news); + + setTimeout(() => { + this.setupNewsObserver(); + }, 100); + }); + + this.initCheckDescription(descEl); + } + + private setupNewsObserver(): void { + this.observer?.disconnect(); + + this.observer = new IntersectionObserver(this.onNewsInView.bind(this), { + root: document.querySelector(".office__body"), + threshold: 0, + }); + + document.querySelectorAll(".news__item").forEach(el => { + this.observer!.observe(el); + }); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/detail/profile-detail-projects-info.service.ts b/projects/social_platform/src/app/api/profile/facades/detail/profile-detail-projects-info.service.ts new file mode 100644 index 00000000..79d1c123 --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/detail/profile-detail-projects-info.service.ts @@ -0,0 +1,39 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { Subject, takeUntil } from "rxjs"; +import { Project } from "../../../../domain/project/project.model"; +import { ActivatedRoute } from "@angular/router"; +import { ProjectsDetailUIInfoService } from "../../../project/facades/detail/ui/projects-detail-ui.service"; +import { ProfileDetailUIInfoService } from "./ui/profile-detail-ui-info.service"; + +@Injectable() +export class ProfileDetailProjectsInfoService { + private readonly route = inject(ActivatedRoute); + private readonly projectsDetailUIInfoService = inject(ProjectsDetailUIInfoService); + private readonly profileDetailUIInfoService = inject(ProfileDetailUIInfoService); + private readonly destroy$ = new Subject(); + + readonly user = this.profileDetailUIInfoService.user; + readonly loggedUserId = this.projectsDetailUIInfoService.loggedUserId; + readonly subs = signal(undefined); + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + initializationProfileProjects(): void { + this.route.data.pipe(takeUntil(this.destroy$)).subscribe({ + next: ({ data }) => { + this.applyInitProfileProjects(data); + }, + }); + } + + private applyInitProfileProjects(data: any): void { + this.user.set(data.user); + this.projectsDetailUIInfoService.applySetLoggedUserId("logged", data.user.id); + this.subs.set(data.subs); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/detail/ui/profile-detail-ui-info.service.ts b/projects/social_platform/src/app/api/profile/facades/detail/ui/profile-detail-ui-info.service.ts new file mode 100644 index 00000000..99a9d2b3 --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/detail/ui/profile-detail-ui-info.service.ts @@ -0,0 +1,55 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { DirectionItem, directionItemBuilder } from "@utils/helpers/directionItemBuilder"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { ProjectsDetailUIInfoService } from "../../../../project/facades/detail/ui/projects-detail-ui.service"; + +@Injectable() +export class ProfileDetailUIInfoService { + private readonly projectsDetailUIInfoService = inject(ProjectsDetailUIInfoService); + + readonly user = signal(undefined); + readonly loggedUserId = this.projectsDetailUIInfoService.loggedUserId; + + readonly isProfileEmpty = signal(undefined); + readonly isProfileFill = signal(false); + + readonly directions = signal([]); + readonly isShowModal = signal(false); + + applyInitProfile(data: any): void { + const userWithProgress = data["data"]["user"]; + this.initializationDirections(userWithProgress); + this.user.set(userWithProgress); + this.isProfileFill.set(userWithProgress.progress! < 100); + } + + applyProfileEmpty(): void { + this.isProfileEmpty.set( + !( + this.user()?.firstName && + this.user()?.lastName && + this.user()?.email && + this.user()?.avatar && + this.user()?.birthday + ) + ); + } + + applyOpenWorkInfoModal(): void { + this.isShowModal.set(true); + } + + private initializationDirections(user: User): void { + this.directions.set( + directionItemBuilder( + 2, + ["навыки", "достижения"], + ["squiz", "medal"], + [user.skills, user.achievements], + ["array", "array"] + )! + ); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-achievements-info.service.ts b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-achievements-info.service.ts new file mode 100644 index 00000000..2fe5b34e --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-achievements-info.service.ts @@ -0,0 +1,142 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, Validators } from "@angular/forms"; +import { Subject } from "rxjs"; +import { ProfileFormService } from "./profile-form.service"; +import { ProfileEditInfoService } from "./profile-edit-info.service"; +import { transformYearStringToNumber } from "@utils/helpers/transformYear"; + +@Injectable() +export class ProfileEditAchievementsInfoService { + private readonly fb = inject(FormBuilder); + private readonly profileFormService = inject(ProfileFormService); + private readonly profileEditInfoService = inject(ProfileEditInfoService); + + private readonly destroy$ = new Subject(); + + private readonly profileForm = this.profileFormService.getForm(); + private readonly editIndex = this.profileEditInfoService.editIndex; + + readonly achievementItems = signal([]); + private readonly achievements = this.profileFormService.achievements; + + private readonly achievementsYearList = this.profileFormService.achievementsYearList; + + readonly editAchievementsClick = signal(false); + readonly showAchievementsFields = signal(false); + + readonly selectedAchievementsYearId = signal(undefined); + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Добавление записи об достижении + * Валидирует форму и добавляет новую запись в массив достижений + */ + addAchievement(): void { + if (!this.showAchievementsFields()) { + this.showAchievementsFields.set(true); + + this.profileForm.patchValue({ + title: "", + status: "", + year: null, + files: "", + }); + + return; + } + + ["title", "status", "year"].forEach(name => this.profileForm.get(name)?.clearValidators()); + ["title", "status", "year"].forEach(name => + this.profileForm.get(name)?.setValidators([Validators.required]) + ); + ["title", "status", "year"].forEach(name => + this.profileForm.get(name)?.updateValueAndValidity() + ); + ["title", "status", "year"].forEach(name => this.profileForm.get(name)?.markAsTouched()); + + const achievementsYear = + typeof this.profileForm.get("year")?.value === "string" + ? +this.profileForm.get("year")?.value.slice(0, 5) + : this.profileForm.get("year")?.value; + + const achievementsItem = this.fb.group({ + id: [null], + title: this.profileForm.get("title")?.value, + status: this.profileForm.get("status")?.value, + year: achievementsYear, + files: Array.isArray(this.profileForm.get("files")?.value) + ? this.profileForm.get("files")?.value + : [this.profileForm.get("files")?.value].filter(Boolean), + }); + + if (this.editIndex() !== null) { + const existingId = this.achievements.at(this.editIndex()!).get("id")?.value; + + this.achievements.at(this.editIndex()!).patchValue({ + ...achievementsItem.value, + id: existingId, + }); + + this.achievementItems.update(items => { + const updatedItems = [...items]; + updatedItems[this.editIndex()!] = { ...achievementsItem.value, id: existingId }; + return updatedItems; + }); + + this.editIndex.set(null); + } else { + this.achievementItems.update(items => [...items, achievementsItem.value]); + this.achievements.push(achievementsItem); + } + ["title", "status", "year", "files"].forEach(name => { + this.profileForm.get(name)?.reset(); + this.profileForm.get(name)?.setValue(""); + this.profileForm.get(name)?.clearValidators(); + this.profileForm.get(name)?.markAsPristine(); + this.profileForm.get(name)?.markAsUntouched(); + this.profileForm.get(name)?.updateValueAndValidity(); + }); + + this.showAchievementsFields.set(false); + this.editAchievementsClick.set(false); + } + + /** + * Редактирование записи об достижений + * @param index - индекс записи в массиве достижений + */ + editAchievements(index: number) { + this.editAchievementsClick.set(true); + this.showAchievementsFields.set(true); + const achievementItem = this.achievements.value[index]; + + this.achievementsYearList.forEach(achievementYear => { + if (transformYearStringToNumber(achievementYear.value as string) === achievementItem.year) { + this.selectedAchievementsYearId.set(achievementYear.id); + } + }); + + this.profileForm.patchValue({ + title: achievementItem.title, + status: achievementItem.status, + year: achievementItem.year, + files: achievementItem.files, + }); + this.editIndex.set(index); + } + + /** + * Удаление записи об достижении + * @param i - индекс записи для удаления + */ + removeAchievement(i: number): void { + this.achievementItems.update(items => items.filter((_, index) => index !== i)); + this.achievements.removeAt(i); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-education-info.service.ts b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-education-info.service.ts new file mode 100644 index 00000000..bf3d1545 --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-education-info.service.ts @@ -0,0 +1,185 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, Validators } from "@angular/forms"; +import { Subject } from "rxjs"; +import { ProfileFormService } from "./profile-form.service"; +import { ProfileEditInfoService } from "./profile-edit-info.service"; +import { transformYearStringToNumber } from "@utils/helpers/transformYear"; + +@Injectable() +export class ProfileEditEducationInfoService { + private readonly fb = inject(FormBuilder); + private readonly profileFormService = inject(ProfileFormService); + private readonly profileEditInfoService = inject(ProfileEditInfoService); + + private readonly destroy$ = new Subject(); + + private readonly profileForm = this.profileFormService.getForm(); + + private readonly editIndex = this.profileEditInfoService.editIndex; + + readonly showEducationFields = signal(false); + readonly editEducationClick = signal(false); + + readonly educationItems = signal([]); + private readonly education = this.profileFormService.education; + + private readonly yearListEducation = this.profileFormService.yearListEducation; + private readonly educationStatusList = this.profileFormService.educationStatusList; + private readonly educationLevelList = this.profileFormService.educationLevelList; + + readonly selectedEntryYearEducationId = signal(undefined); + readonly selectedComplitionYearEducationId = signal(undefined); + readonly selectedEducationStatusId = signal(undefined); + readonly selectedEducationLevelId = signal(undefined); + + private readonly isModalErrorSkillsChoose = this.profileEditInfoService.isModalErrorSkillsChoose; + private readonly isModalErrorSkillChooseText = + this.profileEditInfoService.isModalErrorSkillChooseText; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Добавление записи об образовании + * Валидирует форму и добавляет новую запись в массив образования + */ + addEducation() { + if (!this.showEducationFields()) { + this.showEducationFields.set(true); + return; + } + + ["organizationName", "educationStatus"].forEach(name => + this.profileForm.get(name)?.clearValidators() + ); + ["organizationName", "educationStatus"].forEach(name => + this.profileForm.get(name)?.setValidators([Validators.required]) + ); + ["organizationName", "educationStatus"].forEach(name => + this.profileForm.get(name)?.updateValueAndValidity() + ); + ["organizationName", "educationStatus"].forEach(name => + this.profileForm.get(name)?.markAsTouched() + ); + + const entryYear = + typeof this.profileForm.get("entryYear")?.value === "string" + ? +this.profileForm.get("entryYear")?.value.slice(0, 5) + : this.profileForm.get("entryYear")?.value; + const completionYear = + typeof this.profileForm.get("completionYear")?.value === "string" + ? +this.profileForm.get("completionYear")?.value.slice(0, 5) + : this.profileForm.get("completionYear")?.value; + + if (entryYear !== null && completionYear !== null && entryYear > completionYear) { + this.isModalErrorSkillsChoose.set(true); + this.isModalErrorSkillChooseText.set("Год начала обучения должен быть меньше года окончания"); + return; + } + + const educationItem = this.fb.group({ + organizationName: this.profileForm.get("organizationName")?.value, + entryYear, + completionYear, + description: this.profileForm.get("description")?.value, + educationStatus: this.profileForm.get("educationStatus")?.value, + educationLevel: this.profileForm.get("educationLevel")?.value, + }); + + const isOrganizationValid = this.profileForm.get("organizationName")?.valid; + const isStatusValid = this.profileForm.get("educationStatus")?.valid; + + if (isOrganizationValid && isStatusValid) { + if (this.editIndex() !== null) { + this.educationItems.update(items => { + const updatedItems = [...items]; + updatedItems[this.editIndex()!] = educationItem.value; + + this.education.at(this.editIndex()!).patchValue(educationItem.value); + return updatedItems; + }); + this.editIndex.set(null); + } else { + this.educationItems.update(items => [...items, educationItem.value]); + this.education.push(educationItem); + } + [ + "organizationName", + "entryYear", + "completionYear", + "description", + "educationStatus", + "educationLevel", + ].forEach(name => { + this.profileForm.get(name)?.reset(); + this.profileForm.get(name)?.setValue(""); + this.profileForm.get(name)?.clearValidators(); + this.profileForm.get(name)?.markAsPristine(); + this.profileForm.get(name)?.updateValueAndValidity(); + }); + this.showEducationFields.set(false); + } + this.editEducationClick.set(false); + } + + /** + * Редактирование записи об образовании + * @param index - индекс записи в массиве образования + */ + editEducation(index: number) { + this.editEducationClick.set(true); + this.showEducationFields.set(true); + const educationItem = this.education.value[index]; + + this.yearListEducation.forEach(entryYearWork => { + if (transformYearStringToNumber(entryYearWork.value as string) === educationItem.entryYear) { + this.selectedEntryYearEducationId.set(entryYearWork.id); + } + }); + + this.yearListEducation.forEach(completionYearWork => { + if ( + transformYearStringToNumber(completionYearWork.value as string) === + educationItem.completionYear + ) { + this.selectedComplitionYearEducationId.set(completionYearWork.id); + } + }); + + this.educationLevelList.forEach(educationLevel => { + if (educationLevel.value === educationItem.educationLevel) { + this.selectedEducationLevelId.set(educationLevel.id); + } + }); + + this.educationStatusList.forEach(educationStatus => { + if (educationStatus.value === educationItem.educationStatus) { + this.selectedEducationStatusId.set(educationStatus.id); + } + }); + + this.profileForm.patchValue({ + organizationName: educationItem.organizationName, + entryYear: educationItem.entryYear, + completionYear: educationItem.completionYear, + description: educationItem.description, + educationStatus: educationItem.educationStatus, + educationLevel: educationItem.educationLevel, + }); + this.editIndex.set(index); + } + + /** + * Удаление записи об образовании + * @param i - индекс записи для удаления + */ + removeEducation(i: number) { + this.educationItems.update(items => items.filter((_, index) => index !== i)); + + this.education.removeAt(i); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-experience-info.service.ts b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-experience-info.service.ts new file mode 100644 index 00000000..95a79a02 --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-experience-info.service.ts @@ -0,0 +1,160 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, Validators } from "@angular/forms"; +import { transformYearStringToNumber } from "@utils/helpers/transformYear"; +import { Subject } from "rxjs"; +import { ProfileFormService } from "./profile-form.service"; +import { ProfileEditInfoService } from "./profile-edit-info.service"; + +@Injectable() +export class ProfileEditExperienceInfoService { + private readonly fb = inject(FormBuilder); + private readonly profileFormService = inject(ProfileFormService); + private readonly profileEditInfoService = inject(ProfileEditInfoService); + + private readonly destroy$ = new Subject(); + + private readonly profileForm = this.profileFormService.getForm(); + private readonly editIndex = this.profileEditInfoService.editIndex; + + readonly workItems = signal([]); + private readonly workExperience = this.profileFormService.workExperience; + + readonly editWorkClick = signal(false); + readonly showWorkFields = signal(false); + + readonly yearListEducation = this.profileFormService.yearListEducation; + + readonly selectedEntryYearWorkId = signal(undefined); + readonly selectedComplitionYearWorkId = signal(undefined); + + private readonly isModalErrorSkillsChoose = this.profileEditInfoService.isModalErrorSkillsChoose; + private readonly isModalErrorSkillChooseText = + this.profileEditInfoService.isModalErrorSkillChooseText; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Добавление записи об опыте работы + * Валидирует форму и добавляет новую запись в массив опыта работы + */ + addWork() { + if (!this.showWorkFields()) { + this.showWorkFields.set(true); + return; + } + + ["organization", "jobPosition"].forEach(name => this.profileForm.get(name)?.clearValidators()); + ["organization", "jobPosition"].forEach(name => + this.profileForm.get(name)?.setValidators([Validators.required]) + ); + ["organization", "jobPosition"].forEach(name => + this.profileForm.get(name)?.updateValueAndValidity() + ); + ["organization", "jobPosition"].forEach(name => this.profileForm.get(name)?.markAsTouched()); + + const entryYear = + typeof this.profileForm.get("entryYearWork")?.value === "string" + ? this.profileForm.get("entryYearWork")?.value.slice(0, 5) + : this.profileForm.get("entryYearWork")?.value; + const completionYear = + typeof this.profileForm.get("completionYearWork")?.value === "string" + ? this.profileForm.get("completionYearWork")?.value.slice(0, 5) + : this.profileForm.get("completionYearWork")?.value; + + if (entryYear !== null && completionYear !== null && entryYear > completionYear) { + this.isModalErrorSkillsChoose.set(true); + this.isModalErrorSkillChooseText.set("Год начала работы должен быть меньше года окончания"); + return; + } + + const workItem = this.fb.group({ + organizationName: this.profileForm.get("organization")?.value, + entryYear, + completionYear, + description: this.profileForm.get("descriptionWork")?.value, + jobPosition: this.profileForm.get("jobPosition")?.value, + }); + + const isOrganizationValid = this.profileForm.get("organization")?.valid; + const isPositionValid = this.profileForm.get("jobPosition")?.valid; + + if (isOrganizationValid && isPositionValid) { + if (this.editIndex() !== null) { + this.workItems.update(items => { + const updatedItems = [...items]; + updatedItems[this.editIndex()!] = workItem.value; + + this.workExperience.at(this.editIndex()!).patchValue(workItem.value); + return updatedItems; + }); + this.editIndex.set(null); + } else { + this.workItems.update(items => [...items, workItem.value]); + this.workExperience.push(workItem); + } + [ + "organization", + "entryYearWork", + "completionYearWork", + "descriptionWork", + "jobPosition", + ].forEach(name => { + this.profileForm.get(name)?.reset(); + this.profileForm.get(name)?.setValue(""); + this.profileForm.get(name)?.clearValidators(); + this.profileForm.get(name)?.markAsPristine(); + this.profileForm.get(name)?.updateValueAndValidity(); + }); + this.showWorkFields.set(false); + } + this.editWorkClick.set(false); + } + + editWork(index: number) { + this.editWorkClick.set(true); + this.showWorkFields.set(true); + const workItem = this.workExperience.value[index]; + + if (workItem) { + this.yearListEducation.forEach(entryYearWork => { + if ( + transformYearStringToNumber(entryYearWork.value as string) === workItem.entryYearWork || + transformYearStringToNumber(entryYearWork.value as string) === workItem.entryYear + ) { + this.selectedEntryYearWorkId.set(entryYearWork.id); + } + }); + + this.yearListEducation.forEach(complitionYearWork => { + if ( + transformYearStringToNumber(complitionYearWork.value as string) === + workItem.completionYearWork || + transformYearStringToNumber(complitionYearWork.value as string) === + workItem.completionYear + ) { + this.selectedComplitionYearWorkId.set(complitionYearWork.id); + } + }); + + this.profileForm.patchValue({ + organization: workItem.organization || workItem.organizationName, + entryYearWork: workItem.entryYearWork || workItem.entryYear, + completionYearWork: workItem.completionYearWork || workItem.completionYear, + descriptionWork: workItem.descriptionWork || workItem.description, + jobPosition: workItem.jobPosition, + }); + this.editIndex.set(index); + } + } + + removeWork(i: number) { + this.workItems.update(items => items.filter((_, index) => index !== i)); + + this.workExperience.removeAt(i); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-info.service.ts b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-info.service.ts new file mode 100644 index 00000000..900bac2a --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-info.service.ts @@ -0,0 +1,158 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { concatMap, Subject, takeUntil } from "rxjs"; +import { ProfileFormService } from "./profile-form.service"; +import { Achievement } from "projects/social_platform/src/app/domain/auth/user.model"; +import dayjs from "dayjs"; +import { AuthService } from "../../../auth"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; +import { NavigationService } from "../../../paths/navigation.service"; + +@Injectable() +export class ProfileEditInfoService { + private readonly profileFormService = inject(ProfileFormService); + private readonly authService = inject(AuthService); + private readonly navigationService = inject(NavigationService); + + private readonly destroy$ = new Subject(); + + private readonly profileForm = this.profileFormService.getForm(); + + readonly editIndex = signal(null); + + readonly profileFormSubmitting = signal(false); + + readonly isModalErrorSkillsChoose = signal(false); + readonly isModalErrorSkillChooseText = signal(""); + + private readonly typeSpecific = this.profileFormService.typeSpecific; + private readonly achievements = this.profileFormService.achievements; + private readonly profileId = this.profileFormService.profileId; + + private userTypeMap: { [type: number]: string } = { + 1: "member", + 2: "mentor", + 3: "expert", + 4: "investor", + }; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Сохранение профиля пользователя + * Валидирует всю форму и отправляет данные на сервер + */ + saveProfile(): void { + this.profileForm.markAllAsTouched(); + this.profileForm.updateValueAndValidity(); + + const tempFields = [ + "organizationName", + "entryYear", + "completionYear", + "description", + "educationLevel", + "educationStatus", + "organization", + "entryYearWork", + "completionYearWork", + "descriptionWork", + "jobPosition", + "language", + "languageLevel", + "title", + "status", + "year", + "files", + "phoneNumber", + ]; + + tempFields.forEach(name => { + const control = this.profileForm.get(name); + if (control) { + control.clearValidators(); + control.updateValueAndValidity(); + } + }); + + const mainFieldsValid = ["firstName", "lastName", "birthday", "speciality", "city"].every( + name => this.profileForm.get(name)?.valid + ); + + if (!mainFieldsValid || this.profileFormSubmitting()) { + this.isModalErrorSkillsChoose.set(true); + return; + } + + this.profileFormSubmitting.set(true); + + const achievements = this.achievements.value.map((achievement: Achievement) => ({ + ...(achievement.id && { id: achievement.id }), + title: achievement.title, + status: achievement.status, + year: achievement.year, + fileLinks: + achievement.files && Array.isArray(achievement.files) + ? achievement.files + .map((file: any) => (typeof file === "string" ? file : file.link)) + .filter(Boolean) + : achievement.files + ? [achievement.files] + : [], + })); + + const newProfile = { + ...this.profileForm.value, + achievements, + [this.userTypeMap[this.profileForm.value.userType]]: this.typeSpecific.value, + typeSpecific: undefined, + birthday: this.profileForm.value.birthday + ? dayjs(this.profileForm.value.birthday, "DD.MM.YYYY").format("YYYY-MM-DD") + : undefined, + skillsIds: this.profileForm.value.skills.map((s: Skill) => s.id), + phoneNumber: + typeof this.profileForm.value.phoneNumber === "string" + ? this.profileForm.value.phoneNumber.replace(/^([87])/, "+7") + : this.profileForm.value.phoneNumber, + }; + + this.authService + .saveProfile(newProfile) + .pipe( + concatMap(() => this.authService.getProfile()), + takeUntil(this.destroy$) + ) + .subscribe({ + next: () => { + this.profileFormSubmitting.set(false); + this.navigationService.profileRedirect(this.profileId()); + }, + error: error => { + this.profileFormSubmitting.set(false); + this.isModalErrorSkillsChoose.set(true); + if (error.error.phone_number) { + this.isModalErrorSkillChooseText.set(error.error.phone_number[0]); + } else if (error.error.language) { + this.isModalErrorSkillChooseText.set(error.error.language); + } else if (error.error.achievements) { + this.isModalErrorSkillChooseText.set(error.error.achievements[0]); + } else if (error.error.work_experience?.[2]) { + const errorText = error.error.work_experience[2].entry_year + ? error.error.work_experience[2].entry_year + : error.error.work_experience[2].completion_year; + this.isModalErrorSkillChooseText.set(errorText); + } else if (error.error.first_name?.[0]) { + this.isModalErrorSkillChooseText.set(error.error.first_name?.[0]); + } else if (error.error.last_name?.[0]) { + this.isModalErrorSkillChooseText.set(error.error.last_name?.[0]); + } else { + this.isModalErrorSkillChooseText.set(error.error[0]); + } + }, + }); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-skills-info.service.ts b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-skills-info.service.ts new file mode 100644 index 00000000..e74c3c9d --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/edit/profile-edit-skills-info.service.ts @@ -0,0 +1,130 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, Validators } from "@angular/forms"; +import { Subject } from "rxjs"; +import { ProfileEditInfoService } from "./profile-edit-info.service"; +import { ProfileFormService } from "./profile-form.service"; + +@Injectable() +export class ProfileEditSkillsInfoService { + private readonly fb = inject(FormBuilder); + private readonly profileEditInfoService = inject(ProfileEditInfoService); + private readonly profileFormService = inject(ProfileFormService); + + private readonly destroy$ = new Subject(); + + protected readonly editIndex = this.profileEditInfoService.editIndex; + + private readonly profileForm = this.profileFormService.getForm(); + + readonly editLanguageClick = signal(false); + readonly showLanguageFields = signal(false); + + readonly languageItems = signal([]); + private readonly userLanguages = this.profileFormService.userLanguages; + + private readonly languageList = this.profileFormService.languageList; + private readonly languageLevelList = this.profileFormService.languageLevelList; + + readonly selectedLanguageId = signal(undefined); + readonly selectedLanguageLevelId = signal(undefined); + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + addLanguage() { + if (!this.showLanguageFields()) { + this.showLanguageFields.set(true); + return; + } + + const languageValue = this.profileForm.get("language")?.value; + const languageLevelValue = this.profileForm.get("languageLevel")?.value; + + ["language", "languageLevel"].forEach(name => { + this.profileForm.get(name)?.clearValidators(); + }); + + if ((languageValue && !languageLevelValue) || (!languageValue && languageLevelValue)) { + ["language", "languageLevel"].forEach(name => { + this.profileForm.get(name)?.setValidators([Validators.required]); + }); + } + + ["language", "languageLevel"].forEach(name => { + this.profileForm.get(name)?.updateValueAndValidity(); + this.profileForm.get(name)?.markAsTouched(); + }); + + const isLanguageValid = this.profileForm.get("language")?.valid; + const isLanguageLevelValid = this.profileForm.get("languageLevel")?.valid; + + if (!isLanguageValid || !isLanguageLevelValid) { + return; + } + + const languageItem = this.fb.group({ + language: languageValue, + languageLevel: languageLevelValue, + }); + + if (languageValue && languageLevelValue) { + if (this.editIndex() !== null) { + this.languageItems.update(items => { + const updatedItems = [...items]; + updatedItems[this.editIndex()!] = languageItem.value; + this.userLanguages.at(this.editIndex()!).patchValue(languageItem.value); + return updatedItems; + }); + this.editIndex.set(null); + } else { + this.languageItems.update(items => [...items, languageItem.value]); + this.userLanguages.push(languageItem); + } + + ["language", "languageLevel"].forEach(name => { + this.profileForm.get(name)?.reset(); + this.profileForm.get(name)?.setValue(null); + this.profileForm.get(name)?.clearValidators(); + this.profileForm.get(name)?.markAsPristine(); + this.profileForm.get(name)?.updateValueAndValidity(); + }); + this.showLanguageFields.set(false); + } + this.editLanguageClick.set(false); + } + + editLanguage(index: number) { + this.editLanguageClick.set(true); + this.showLanguageFields.set(true); + const languageItem = this.userLanguages.value[index]; + + this.languageList.forEach(language => { + if (language.value === languageItem.language) { + this.selectedLanguageId.set(language.id); + } + }); + + this.languageLevelList.forEach(languageLevel => { + if (languageLevel.value === languageItem.languageLevel) { + this.selectedLanguageLevelId.set(languageLevel.id); + } + }); + + this.profileForm.patchValue({ + language: languageItem.language, + languageLevel: languageItem.languageLevel, + }); + + this.editIndex.set(index); + } + + removeLanguage(i: number) { + this.languageItems.update(items => items.filter((_, index) => index !== i)); + + this.userLanguages.removeAt(i); + } +} diff --git a/projects/social_platform/src/app/api/profile/facades/edit/profile-form.service.ts b/projects/social_platform/src/app/api/profile/facades/edit/profile-form.service.ts new file mode 100644 index 00000000..0674bc54 --- /dev/null +++ b/projects/social_platform/src/app/api/profile/facades/edit/profile-form.service.ts @@ -0,0 +1,369 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; +import { concatMap, first, map, Observable, skip, Subject, takeUntil } from "rxjs"; +import { AuthService } from "../../../auth"; +import dayjs from "dayjs"; +import { yearRangeValidators } from "@utils/helpers/yearRangeValidators"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { Specialization } from "projects/social_platform/src/app/domain/specializations/specialization"; +import { SelectComponent } from "@ui/components"; +import { generateOptionsList } from "@utils/generate-options-list"; +import { + educationUserLevel, + educationUserType, +} from "projects/core/src/consts/lists/education-info-list.const"; +import { + languageLevelsList, + languageNamesList, +} from "projects/core/src/consts/lists/language-info-list.const"; + +@Injectable({ providedIn: "root" }) +export class ProfileFormService { + private readonly fb = inject(FormBuilder); + private readonly authService = inject(AuthService); + + private readonly destroy$ = new Subject(); + + private profileForm!: FormGroup; + + readonly inlineSpecs = signal([]); + readonly profileId = signal(undefined); + + readonly roles = signal([]); + + readonly newPreferredIndustryTitle = signal(""); + + readonly yearListEducation = generateOptionsList(55, "years").reverse(); + readonly educationStatusList = educationUserType; + readonly educationLevelList = educationUserLevel; + + readonly achievementsYearList = generateOptionsList(25, "years"); + + readonly languageList = languageNamesList; + readonly languageLevelList = languageLevelsList; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + constructor() { + this.initializeProfileForm(); + + this.authService.changeableRoles + .pipe( + map(roles => roles.map(role => ({ id: role.id, value: role.id, label: role.name }))), + takeUntil(this.destroy$) + ) + .subscribe({ + next: roles => { + this.roles.set(roles); + }, + }); + } + + private initializeProfileForm(): void { + this.profileForm = this.fb.group({ + firstName: ["", [Validators.required]], + lastName: ["", [Validators.required]], + email: ["", [Validators.email, Validators.maxLength(50)]], + userType: [0], + birthday: ["", [Validators.required]], + city: ["", [Validators.required, Validators.maxLength(100)]], + phoneNumber: ["", Validators.maxLength(12)], + additionalRole: [null], + coverImageAddress: [null], + + // education + organizationName: ["", Validators.maxLength(100)], + entryYear: [null], + completionYear: [null], + description: [null, Validators.maxLength(400)], + educationLevel: [null], + educationStatus: [""], + isMospolytechStudent: [false], + studyGroup: ["", Validators.maxLength(10)], + + // language + language: [null], + languageLevel: [null], + + // achievements + title: [null], + status: [null], + year: [null], + files: [""], + + education: this.fb.array([]), + workExperience: this.fb.array([]), + userLanguages: this.fb.array([]), + links: this.fb.array([]), + achievements: this.fb.array([]), + + // work + organization: ["", Validators.maxLength(50)], + entryYearWork: [null], + completionYearWork: [null], + descriptionWork: [null, Validators.maxLength(400)], + jobPosition: [""], + + // skills + speciality: ["", [Validators.required]], + skills: [[]], + avatar: [""], + aboutMe: ["", Validators.maxLength(300)], + typeSpecific: this.fb.group({}), + }); + + this.profileForm + .get("userType") + ?.valueChanges.pipe( + skip(1), + concatMap(this.changeUserType.bind(this)), + takeUntil(this.destroy$) + ) + .subscribe(); + + this.profileForm + .get("avatar") + ?.valueChanges.pipe( + skip(1), + concatMap(url => this.authService.saveAvatar(url)), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + public initializeProfileData(): void { + this.authService.profile.pipe(first(), takeUntil(this.destroy$)).subscribe((profile: User) => { + this.profileId.set(profile.id); + + this.profileForm.patchValue({ + firstName: profile.firstName ?? "", + lastName: profile.lastName ?? "", + email: profile.email ?? "", + userType: profile.userType ?? 1, + birthday: profile.birthday ? dayjs(profile.birthday).format("DD.MM.YYYY") : "", + city: profile.city ?? "", + coverImageAddress: profile.coverImageAddress ?? "", + phoneNumber: profile.phoneNumber ?? "", + additionalRole: profile.v2Speciality?.name ?? "", + speciality: profile.speciality ?? "", + skills: profile.skills ?? [], + avatar: profile.avatar ?? "", + aboutMe: profile.aboutMe ?? "", + isMospolytechStudent: profile.isMospolytechStudent ?? false, + studyGroup: profile.studyGroup ?? "", + }); + + this.workExperience.clear(); + profile.workExperience.forEach(work => { + this.workExperience.push( + this.fb.group( + { + organizationName: work.organizationName, + entryYear: work.entryYear, + completionYear: work.completionYear, + description: work.description, + jobPosition: work.jobPosition, + }, + { + validators: yearRangeValidators("entryYear", "completionYear"), + } + ) + ); + }); + + this.education.clear(); + profile.education.forEach(edu => { + this.education.push( + this.fb.group( + { + organizationName: edu.organizationName, + entryYear: edu.entryYear, + completionYear: edu.completionYear, + description: edu.description, + educationStatus: edu.educationStatus, + educationLevel: edu.educationLevel, + }, + { + validators: yearRangeValidators("entryYear", "completionYear"), + } + ) + ); + }); + + this.userLanguages.clear(); + profile.userLanguages.forEach(lang => { + this.userLanguages.push( + this.fb.group({ + language: lang.language, + languageLevel: lang.languageLevel, + }) + ); + }); + + this.achievements.clear(); + profile.achievements.forEach(achievement => { + this.achievements.push( + this.fb.group({ + id: [achievement.id], + title: [achievement.title, Validators.required], + status: [achievement.status, Validators.required], + year: [achievement.year, Validators.required], + files: [achievement.files ?? []], + }) + ); + }); + + profile.links.length && profile.links.forEach(l => this.addLink(l)); + + if ([2, 3, 4].includes(profile.userType)) { + this.typeSpecific?.addControl("preferredIndustries", this.fb.array([])); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + profile[this.userTypeMap[profile.userType]].preferredIndustries.forEach( + (industry: string) => this.addPreferredIndustry(industry) + ); + } + + if ([1, 3, 4].includes(profile.userType)) { + const userTypeData = profile.member ?? profile.mentor ?? profile.expert; + this.typeSpecific.addControl("usefulToProject", this.fb.control("")); + this.typeSpecific.get("usefulToProject")?.patchValue(userTypeData?.usefulToProject); + } + }); + } + + /** + * Возвращает основную форму проекта. + * @returns FormGroup экземпляр формы проекта + */ + public getForm(): FormGroup { + return this.profileForm; + } + + get avatar(): FormControl { + return this.profileForm.get("avatar") as FormControl; + } + + get coverImageAddress(): FormControl { + return this.profileForm.get("coverImageAddress") as FormControl; + } + + get firstName(): FormControl { + return this.profileForm.get("firstName") as FormControl; + } + + get lastName(): FormControl { + return this.profileForm.get("lastName") as FormControl; + } + + get city(): FormControl { + return this.profileForm.get("city") as FormControl; + } + + get birthday(): FormControl { + return this.profileForm.get("birthday") as FormControl; + } + + get userType(): FormControl { + return this.profileForm.get("userType") as FormControl; + } + + get speciality(): FormControl { + return this.profileForm.get("speciality") as FormControl; + } + + get aboutMe(): FormControl { + return this.profileForm.get("aboutMe") as FormControl; + } + + get phoneNumber(): FormControl { + return this.profileForm.get("phoneNumber") as FormControl; + } + + get achievements(): FormArray { + return this.profileForm.get("achievements") as FormArray; + } + + get education(): FormArray { + return this.profileForm.get("education") as FormArray; + } + + get workExperience(): FormArray { + return this.profileForm.get("workExperience") as FormArray; + } + + get userLanguages(): FormArray { + return this.profileForm.get("userLanguages") as FormArray; + } + + get links(): FormArray { + return this.profileForm.get("links") as FormArray; + } + + get typeSpecific(): FormGroup { + return this.profileForm.get("typeSpecific") as FormGroup; + } + + get usefulToProject(): FormControl { + return this.typeSpecific.get("usefulToProject") as FormControl; + } + + get preferredIndustries(): FormArray { + return this.typeSpecific.get("preferredIndustries") as FormArray; + } + + addPreferredIndustry(title?: string): void { + const fromState = title ?? this.newPreferredIndustryTitle; + if (!fromState) { + return; + } + + const control = this.fb.control(fromState, [Validators.required]); + this.preferredIndustries.push(control); + + this.newPreferredIndustryTitle.set(""); + } + + removePreferredIndustry(i: number): void { + this.preferredIndustries.removeAt(i); + } + + protected readonly newLink = signal(""); + + addLink(title?: string): void { + const fromState = title ?? this.newLink; + + const control = this.fb.control(fromState, [Validators.required]); + this.links.push(control); + + this.newLink.set(""); + } + + removeLink(i: number): void { + this.links.removeAt(i); + } + + /** + * Изменение типа пользователя + * @param typeId - новый тип пользователя + * @returns Observable - результат операции изменения типа + */ + changeUserType(typeId: number): Observable { + return this.authService + .saveProfile({ + email: this.profileForm.value.email, + firstName: this.profileForm.value.firstName, + lastName: this.profileForm.value.lastName, + userType: typeId, + }) + .pipe( + map(() => location.reload()), + takeUntil(this.destroy$) + ); + } +} diff --git a/projects/social_platform/src/app/api/program/facades/detail/program-detail-list-info.service.ts b/projects/social_platform/src/app/api/program/facades/detail/program-detail-list-info.service.ts new file mode 100644 index 00000000..bbab3d9c --- /dev/null +++ b/projects/social_platform/src/app/api/program/facades/detail/program-detail-list-info.service.ts @@ -0,0 +1,357 @@ +/** @format */ + +import { ElementRef, inject, Injectable } from "@angular/core"; +import { + catchError, + concatMap, + distinctUntilChanged, + EMPTY, + fromEvent, + map, + of, + Subject, + switchMap, + takeUntil, + tap, + throttleTime, +} from "rxjs"; +import { ProgramService } from "../../program.service"; +import { ActivatedRoute, Router } from "@angular/router"; +import { ProjectRatingService } from "../../../project/project-rating.service"; +import { AuthService } from "../../../auth"; +import { SubscriptionService } from "../../../subsriptions/subscription.service"; +import { FormGroup } from "@angular/forms"; +import { HttpParams } from "@angular/common/http"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import Fuse from "fuse.js"; +import { ProgramDetailListUIInfoService } from "./ui/program-detail-list-ui-info.service"; +import { ProjectRate } from "projects/social_platform/src/app/domain/project/project-rate"; + +@Injectable() +export class ProgramDetailListInfoService { + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly programService = inject(ProgramService); + private readonly projectRatingService = inject(ProjectRatingService); + private readonly authService = inject(AuthService); + private readonly subscriptionService = inject(SubscriptionService); + private readonly programDetailListUIInfoService = inject(ProgramDetailListUIInfoService); + + private readonly destroy$ = new Subject(); + + private readonly listType = this.programDetailListUIInfoService.listType; + private readonly searchParamName = this.programDetailListUIInfoService.searchParamName; + private readonly list = this.programDetailListUIInfoService.list; + private readonly searchedList = this.programDetailListUIInfoService.searchedList; + + private readonly listPage = this.programDetailListUIInfoService.listPage; + private readonly itemsPerPage = this.programDetailListUIInfoService.itemsPerPage; + private readonly listTotalCount = this.programDetailListUIInfoService.listTotalCount; + + private readonly searchForm = this.programDetailListUIInfoService.searchForm; + + initializationListData(): void { + this.route.data + .pipe( + tap(data => this.listType.set(data["listType"])), + switchMap(r => of(r["data"])), + takeUntil(this.destroy$) + ) + .subscribe(data => { + this.programDetailListUIInfoService.applyInitializationProgramListData(data); + }); + + this.setupSearch(this.searchForm); + + if (this.listType() === "projects") this.setupProfile(); + + this.setupFilters(); + } + + initScroll(target: HTMLElement, listRoot: ElementRef): void { + fromEvent(target, "scroll") + .pipe( + throttleTime(200), + switchMap(() => this.onScroll(target, listRoot)), + catchError(err => { + console.error("Scroll error:", err); + return of({}); + }), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Сброс всех активных фильтров + * Очищает все query параметры и возвращает к состоянию по умолчанию + */ + onClearFilters(): void { + this.router + .navigate([], { + queryParams: { + search: undefined, + }, + relativeTo: this.route, + queryParamsHandling: "merge", + }) + .then(() => console.log("Query change from ProjectsComponent")); + } + + private setupSearch(searchForm: FormGroup): void { + searchForm + .get("search") + ?.valueChanges.pipe(throttleTime(200), takeUntil(this.destroy$)) + .subscribe(search => { + this.router + .navigate([], { + queryParams: { [this.searchParamName()]: search || null }, + relativeTo: this.route, + queryParamsHandling: "merge", + }) + .then(() => console.debug("QueryParams changed from ProgramListComponent")); + }); + + this.route.queryParams + .pipe( + map(q => q["search"]), + takeUntil(this.destroy$) + ) + .subscribe(search => { + this.searchedList.set(this.applySearch(search)); + }); + } + + setupProfile(): void { + this.authService.profile + .pipe( + switchMap(p => { + return this.subscriptionService.getSubscriptions(p.id); + }), + takeUntil(this.destroy$) + ) + .subscribe({ + next: subs => { + this.programDetailListUIInfoService.applySetupProfile(subs); + }, + }); + } + + private setupFilters(): void { + if (this.listType() === "members") return; + + this.route.queryParams + .pipe( + distinctUntilChanged((prev, curr) => JSON.stringify(prev) === JSON.stringify(curr)), + concatMap(q => { + const { filters, extraParams } = this.buildFilterQuery(q); + const programId = this.route.parent?.snapshot.params["programId"]; + + this.listPage.set(0); + + const params = new HttpParams({ + fromObject: { + offset: "0", + limit: this.itemsPerPage().toString(), + ...extraParams, + }, + }); + + if (this.listType() === "rating") { + if (Object.keys(filters).length > 0) { + return this.projectRatingService.postFilters(programId, filters, params); + } + return this.projectRatingService.getAll(programId, params); + } + + if (Object.keys(filters).length > 0) { + return this.programService.createProgramFilters(programId, filters, params); + } + return this.programService.getAllProjects(programId, params); + }), + catchError(err => { + console.error("Error in setupFilters:", err); + return of({ count: 0, results: [] }); + }), + takeUntil(this.destroy$) + ) + .subscribe(result => { + if (!result) return; + + this.programDetailListUIInfoService.applyInitializationProgramListData(result); + this.listPage.set(0); + }); + } + + getInitialSearchValue(): string { + const qp = this.route.snapshot.queryParams; + const raw = qp["search"] ?? qp["name__contains"]; + return raw ? decodeURIComponent(raw) : ""; + } + + initializeSearchForm(): void { + const initialValue = this.getInitialSearchValue(); + this.programDetailListUIInfoService.applyInitializationSearchForm(initialValue); + } + + // Универсальный метод скролла + private onScroll(target: HTMLElement, listRoot: ElementRef) { + const total = this.listTotalCount(); + + if (total && this.list().length >= total) { + return EMPTY; + } + + if (!target || !listRoot.nativeElement) return EMPTY; + + let shouldFetch = false; + + if (this.listType() === "rating") { + const scrollBottom = target.scrollHeight - target.scrollTop - target.clientHeight; + shouldFetch = scrollBottom <= 200; + } else { + if (!listRoot) return EMPTY; + const diff = + target.scrollTop - + listRoot.nativeElement.getBoundingClientRect().height + + window.innerHeight; + + const threshold = this.listType() === "projects" ? -200 : 0; + shouldFetch = diff > threshold; + } + + if (shouldFetch) { + this.listPage.update(p => p + 1); + return this.onFetch(); + } + + return of({}); + } + + // Универсальный метод загрузки данных + // Универсальный метод загрузки данных + private onFetch() { + const programId = this.route.parent?.snapshot.params["programId"]; + const offset = this.listPage() * this.itemsPerPage(); + + // Получаем текущие query параметры для фильтров + const currentQuery = this.route.snapshot.queryParams; + const { filters, extraParams } = this.buildFilterQuery(currentQuery); + + const params = new HttpParams({ + fromObject: { + offset: offset.toString(), + limit: this.itemsPerPage().toString(), + ...extraParams, + }, + }); + + switch (this.listType()) { + case "rating": { + const ratingRequest$ = + Object.keys(filters).length > 0 + ? this.projectRatingService.postFilters(programId, filters, params) + : this.projectRatingService.getAll(programId, params); + + return ratingRequest$.pipe( + tap((rating: ApiPagination) => { + this.programDetailListUIInfoService.applyFetchProgramData(rating); + }), + catchError(err => { + console.error("Error fetching ratings:", err); + this.listPage.update(p => p - 1); + return of({ count: this.listTotalCount || 0, results: [] }); + }), + takeUntil(this.destroy$) + ); + } + + case "projects": { + const projectsRequest$ = + Object.keys(filters).length > 0 + ? this.programService.createProgramFilters(programId, filters, params) + : this.programService.getAllProjects(programId, params); + + return projectsRequest$.pipe( + tap((projects: ApiPagination) => { + this.programDetailListUIInfoService.applyFetchProgramData(projects); + }), + catchError(err => { + console.error("Error fetching projects:", err); + this.listPage.update(p => p - 1); + return of({ count: this.listTotalCount || 0, results: [] }); + }), + takeUntil(this.destroy$) + ); + } + + case "members": { + return this.programService.getAllMembers(programId, offset, this.itemsPerPage()).pipe( + tap((members: ApiPagination) => { + this.programDetailListUIInfoService.applyFetchProgramData(members); + }), + catchError(err => { + console.error("Error fetching members:", err); + this.listPage.update(p => p - 1); + return of({ count: this.listTotalCount || 0, results: [] }); + }), + takeUntil(this.destroy$) + ); + } + + default: + return of({ count: 0, results: [] }); + } + } + + // Построение запроса для фильтров (кроме участников) + private buildFilterQuery(q: any): { + filters: Record; + extraParams: Record; + } { + if (this.listType() === "members") return { filters: {}, extraParams: {} }; + + const filters: Record = {}; + const extraParams: Record = {}; + + Object.keys(q).forEach(key => { + const value = q[key]; + if (value === undefined || value === "" || value === null) return; + + if (this.listType() === "rating" && (key === "search" || key === "name__contains")) { + extraParams["name__contains"] = value; + return; + } + + if (this.listType() === "rating" && key === "is_rated_by_expert") { + extraParams["is_rated_by_expert"] = value; + return; + } + + filters[key] = Array.isArray(value) ? value : [value]; + }); + + return { filters, extraParams }; + } + + private applySearch(search: string) { + if (!search) return this.list(); + + const searchKeys = + this.listType() === "projects" || this.listType() === "rating" + ? ["name"] + : ["firstName", "lastName"]; + + const fuse = new Fuse(this.list(), { + keys: searchKeys, + }); + return fuse.search(search).map(r => r.item); + } +} diff --git a/projects/social_platform/src/app/api/program/facades/detail/program-detail-main-info.service.ts b/projects/social_platform/src/app/api/program/facades/detail/program-detail-main-info.service.ts new file mode 100644 index 00000000..008ed7b0 --- /dev/null +++ b/projects/social_platform/src/app/api/program/facades/detail/program-detail-main-info.service.ts @@ -0,0 +1,231 @@ +/** @format */ + +import { ElementRef, inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { concatMap, fromEvent, map, of, Subject, takeUntil, tap, throttleTime } from "rxjs"; +import { ProgramNewsService } from "../../program-news.service"; +import { FeedNews } from "projects/social_platform/src/app/domain/project/project-news.model"; +import { LoadingService } from "@ui/services/loading/loading.service"; +import { ExpandService } from "../../../expand/expand.service"; +import { ProgramDetailMainUIInfoService } from "./ui/program-detail-main-ui-info.service"; +import { NewsInfoService } from "../../../news/news-info.service"; + +@Injectable() +export class ProgramDetailMainService { + private readonly programNewsService = inject(ProgramNewsService); + private readonly router = inject(Router); + private readonly route = inject(ActivatedRoute); + private readonly loadingService = inject(LoadingService); + private readonly expandService = inject(ExpandService); + private readonly newsInfoService = inject(NewsInfoService); + private readonly programDetailMainUIInfoService = inject(ProgramDetailMainUIInfoService); + + private observer?: IntersectionObserver; + private readonly destroy$ = new Subject(); + + private readonly totalNewsCount = this.programDetailMainUIInfoService.totalNewsCount; + readonly fetchLimit = signal(10); + readonly fetchPage = signal(0); + + readonly news = this.newsInfoService.news; + readonly program = this.programDetailMainUIInfoService.program; + readonly programId = this.programDetailMainUIInfoService.programId; + + initializationProgramDetailMain(descEl: ElementRef | undefined): void { + this.initializationProgramId(); + this.initializationProgramQueryParams(); + this.initializationProgram(descEl); + } + + private initializationProgramId(): void { + this.route.params + .pipe( + map(params => params["programId"]), + tap(programId => { + this.programId.set(programId); + }), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + private initializationProgramQueryParams(): void { + this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe(param => { + if (param["access"] === "accessDenied") { + this.loadingService.hide(); + this.programDetailMainUIInfoService.applyInitProgramQueryParams(); + + this.router.navigate([], { + relativeTo: this.route, + queryParams: { access: null }, + queryParamsHandling: "merge", + replaceUrl: true, + }); + } + }); + } + + private initializationProgram(descEl: ElementRef | undefined): void { + this.route.data + .pipe( + map(r => r["data"]), + tap(program => { + this.programDetailMainUIInfoService.applyFormatingProgramData(program); + }), + concatMap(program => { + if (program.isUserMember) { + return this.fetchNews(0, this.fetchLimit()); + } else { + return of({ results: [], count: 0 }); + } + }), + takeUntil(this.destroy$) + ) + .subscribe({ + next: news => { + if (news.results?.length) { + this.newsInfoService.applySetNews(news); + this.programDetailMainUIInfoService.applyInitProgram(news); + + setTimeout(() => { + this.setupNewsObserver(); + }, 100); + + this.loadingService.hide(); + } + }, + error: () => { + this.loadingService.hide(); + + this.programDetailMainUIInfoService.applyProgramOpenModal("error"); + }, + }); + + this.checkDescriptionTimeout(descEl); + } + + initScroll(target: HTMLElement, descEl: ElementRef | undefined): void { + this.checkDescriptionTimeout(descEl); + + fromEvent(target, "scroll") + .pipe( + throttleTime(2000), + concatMap(() => this.onScroll()), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + destroy(): void { + this.observer?.disconnect(); + + this.destroy$.next(); + this.destroy$.complete(); + } + + private onScroll() { + if (this.news().length >= this.totalNewsCount()) { + return of(null); + } + + const nextPage = this.fetchPage() + 1; + const offset = nextPage * this.fetchLimit(); + + this.fetchPage.set(nextPage); + + return this.fetchNews(offset, this.fetchLimit()).pipe( + tap(({ count, results }) => { + this.totalNewsCount.set(count); + this.newsInfoService.applyUpdateNews(results); + + setTimeout(() => { + this.setupNewsObserver(); + }, 100); + }) + ); + } + + private fetchNews(offset: number, limit: number) { + const programId = this.route.snapshot.params["programId"]; + return this.programNewsService.fetchNews(limit, offset, programId); + } + + private onNewsInVew(entries: IntersectionObserverEntry[]): void { + const ids = entries.map(e => { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + return e.target.dataset.id; + }); + this.programNewsService + .readNews(this.route.snapshot.params["programId"], ids) + .pipe(takeUntil(this.destroy$)) + .subscribe(); + } + + onAddNews(news: { text: string; files: string[] }) { + return this.programNewsService.addNews(this.route.snapshot.params["programId"], news).pipe( + tap(newsRes => { + this.newsInfoService.applyAddNews(newsRes); + }) + ); + } + + onDelete(newsId: number) { + const item = this.news().find((n: any) => n.id === newsId); + if (!item) return; + this.programNewsService + .deleteNews(this.route.snapshot.params["programId"], newsId) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => { + this.newsInfoService.applyDeleteNews(newsId); + }, + }); + } + + onLike(newsId: number) { + const item = this.news().find((n: any) => n.id === newsId); + if (!item) return; + + this.programNewsService + .toggleLike(this.route.snapshot.params["programId"], newsId, !item.isUserLiked) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.newsInfoService.applyLikeNews(newsId); + }); + } + + onEdit(news: FeedNews, newsId: number) { + return this.programNewsService + .editNews(this.route.snapshot.params["programId"], newsId, news) + .pipe( + tap((newsRes: any) => { + this.newsInfoService.applyEditNews(newsRes); + }) + ); + } + + closeModal(): void { + this.programDetailMainUIInfoService.applyProgramCloseModal(); + this.loadingService.hide(); + } + + private setupNewsObserver(): void { + this.observer?.disconnect(); + + this.observer = new IntersectionObserver(this.onNewsInVew.bind(this), { + root: document.querySelector(".office__body"), + threshold: 0, + }); + + document.querySelectorAll(".news__item").forEach(el => { + this.observer!.observe(el); + }); + } + + checkDescriptionTimeout(descEl: ElementRef | undefined): void { + setTimeout(() => { + this.expandService.checkExpandable("description", !!this.program()?.description, descEl); + }, 100); + } +} diff --git a/projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-list-ui-info.service.ts b/projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-list-ui-info.service.ts new file mode 100644 index 00000000..593638c4 --- /dev/null +++ b/projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-list-ui-info.service.ts @@ -0,0 +1,86 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { FormBuilder } from "@angular/forms"; +import { User } from "projects/social_platform/src/app/domain/auth/user.model"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { ProjectRate } from "projects/social_platform/src/app/domain/project/project-rate"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; + +@Injectable() +export class ProgramDetailListUIInfoService { + private readonly fb = inject(FormBuilder); + + readonly listType = signal<"projects" | "members" | "rating">("projects"); + + readonly listTotalCount = signal(0); + readonly listPage = signal(0); + readonly listTake = signal(20); + readonly perPage = signal(21); + + readonly list = signal([]); + readonly searchedList = signal([]); + + readonly profileSubscriptions = signal([]); + readonly profileProjSubsIds = computed(() => this.profileSubscriptions().map(sub => sub.id)); + + itemsPerPage = computed(() => { + return this.listType() === "rating" + ? 10 + : this.listType() === "projects" + ? this.perPage() + : this.listTake(); + }); + + searchParamName = computed(() => { + return this.listType() === "rating" ? "name__contains" : "search"; + }); + + readonly searchForm = this.fb.group({ + search: [""], + }); + + routerLink(linkId: number): string { + switch (this.listType()) { + case "projects": + return `/office/projects/${linkId}`; + + case "members": + return `/office/profile/${linkId}`; + + default: + return ""; + } + } + + applyInitializationSearchForm(value: string): void { + this.searchForm.setValue({ search: value }); + } + + applyInitializationProgramListData(data: any): void { + this.list.set(data.results); + this.searchedList.set(data.results); + this.listTotalCount.set(data.count); + } + + applySetupProfile(subs: ApiPagination): void { + this.profileSubscriptions.set(subs.results); + } + + applyFetchProgramData( + data: ApiPagination | ApiPagination | ApiPagination + ): void { + this.listTotalCount.set(data.count); + + if (this.listPage() === 0) { + this.list.set(data.results); + } else { + const newResults = data.results.filter( + newItem => !this.list().some(existingItem => existingItem.id === newItem.id) + ); + this.list.update(() => [...this.list(), ...newResults]); + } + + this.searchedList.set(this.list()); + } +} diff --git a/projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-main-ui-info.service.ts b/projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-main-ui-info.service.ts new file mode 100644 index 00000000..f53b7163 --- /dev/null +++ b/projects/social_platform/src/app/api/program/facades/detail/ui/program-detail-main-ui-info.service.ts @@ -0,0 +1,56 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { Program } from "projects/social_platform/src/app/domain/program/program.model"; +import { FeedNews } from "projects/social_platform/src/app/domain/project/project-news.model"; + +@Injectable() +export class ProgramDetailMainUIInfoService { + readonly program = signal(undefined); + readonly programId = signal(undefined); + + readonly totalNewsCount = signal(0); + + // Сигналы для работы с модальными окнами с текстом + readonly showProgramModal = signal(false); + readonly showProgramModalErrorMessage = signal(null); + + readonly registerDateExpired = signal(false); + + applyInitProgramQueryParams(): void { + this.applyProgramOpenModal("access"); + } + + applyInitProgram( + news: + | ApiPagination + | { + results: never[]; + count: number; + } + ): void { + if (news.results?.length) { + this.totalNewsCount.set(news.count); + } + } + + applyFormatingProgramData(program: any): void { + this.program.set(program); + this.registerDateExpired.set(Date.now() > Date.parse(program.datetimeRegistrationEnds)); + } + + applyProgramOpenModal(type: "access" | "error"): void { + const errorText = + type === "access" + ? "У вас не доступа к этой вкладке!" + : "Произошла ошибка при загрузке программы"; + + this.showProgramModal.set(true); + this.showProgramModalErrorMessage.set(errorText); + } + + applyProgramCloseModal(): void { + this.showProgramModal.set(false); + } +} diff --git a/projects/social_platform/src/app/api/program/facades/program-info.service.ts b/projects/social_platform/src/app/api/program/facades/program-info.service.ts new file mode 100644 index 00000000..30ded1ee --- /dev/null +++ b/projects/social_platform/src/app/api/program/facades/program-info.service.ts @@ -0,0 +1,42 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { NavService } from "@ui/services/nav/nav.service"; +import { Subject, takeUntil } from "rxjs"; +import { FormGroup } from "@angular/forms"; + +@Injectable() +export class ProgramInfoService { + private readonly route = inject(ActivatedRoute); + private readonly navService = inject(NavService); + private readonly router = inject(Router); + + private readonly destroy$ = new Subject(); + + initializationPrograms(searchForm: FormGroup): void { + this.navService.setNavTitle("Программы"); + + this.initilizationSearchValue(searchForm); + } + + private initilizationSearchValue(searchForm: FormGroup): void { + searchForm + .get("search") + ?.valueChanges.pipe(takeUntil(this.destroy$)) + .subscribe(search => { + this.router + .navigate([], { + queryParams: { search }, + relativeTo: this.route, + queryParamsHandling: "merge", + }) + .then(() => console.debug("QueryParams changed from ProjectsComponent")); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/projects/social_platform/src/app/api/program/facades/program-main-info.service.ts b/projects/social_platform/src/app/api/program/facades/program-main-info.service.ts new file mode 100644 index 00000000..710c1891 --- /dev/null +++ b/projects/social_platform/src/app/api/program/facades/program-main-info.service.ts @@ -0,0 +1,91 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, Params, Router } from "@angular/router"; +import { NavService } from "@ui/services/nav/nav.service"; +import { combineLatest, distinctUntilChanged, map, Subject, switchMap, takeUntil } from "rxjs"; +import { ProgramService } from "../program.service"; +import { Program } from "../../../domain/program/program.model"; +import { HttpParams } from "@angular/common/http"; +import { ProgramMainUIInfoService } from "./ui/program-main-ui-info.service"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import Fuse from "fuse.js"; + +@Injectable() +export class ProgramMainInfoService { + private readonly navService = inject(NavService); + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly programService = inject(ProgramService); + private readonly programMainUIInfoService = inject(ProgramMainUIInfoService); + + private readonly destroy$ = new Subject(); + + readonly isPparticipating = this.programMainUIInfoService.isPparticipating; + + readonly programs = this.programMainUIInfoService.programs; + + initializationMainPrograms(): void { + this.navService.setNavTitle("Программы"); + + combineLatest([ + this.route.queryParams.pipe( + map(q => ({ filter: this.buildFilterQuery(q), search: q["search"] || "" })), + distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)) + ), + ]) + .pipe( + switchMap(([{ filter, search }]) => { + this.isPparticipating.set(filter["participating"] === "true"); + + return this.programService + .getAll(0, 20, new HttpParams({ fromObject: filter })) + .pipe(map(response => ({ response, search }))); + }), + takeUntil(this.destroy$) + ) + .subscribe(({ response, search }) => { + const programs = this.applySearch(response, search); + + this.programMainUIInfoService.applyPrograms(programs, response.count); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Переключает состояние чекбокса "участвую" + */ + onTogglePparticipating(): void { + const newValue = !this.isPparticipating(); + this.isPparticipating.set(newValue); + + this.router.navigate([], { + queryParams: { + participating: newValue ? "true" : null, + }, + relativeTo: this.route, + queryParamsHandling: "merge", + }); + } + + private buildFilterQuery(q: Params): Record { + const reqQuery: Record = {}; + + if (q["participating"]) { + reqQuery["participating"] = q["participating"]; + } + + return reqQuery; + } + + private applySearch(response: ApiPagination, search: string): Program[] { + if (!search) return response.results; + + const fuse = new Fuse(response.results, { keys: ["name"], threshold: 0.3 }); + return fuse.search(search).map(r => r.item); + } +} diff --git a/projects/social_platform/src/app/api/program/facades/ui/program-main-ui-info.service.ts b/projects/social_platform/src/app/api/program/facades/ui/program-main-ui-info.service.ts new file mode 100644 index 00000000..151d2fde --- /dev/null +++ b/projects/social_platform/src/app/api/program/facades/ui/program-main-ui-info.service.ts @@ -0,0 +1,25 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { generateOptionsList } from "@utils/generate-options-list"; +import { Program } from "projects/social_platform/src/app/domain/program/program.model"; + +@Injectable() +export class ProgramMainUIInfoService { + readonly programCount = signal(0); + readonly isPparticipating = signal(false); + + readonly programs = signal([]); + + readonly programOptionsFilter = generateOptionsList(4, "strings", [ + "все", + "актуальные", + "архив", + "участвовал", + ]); + + applyPrograms(programs: Program[], count: number): void { + this.programCount.set(count); + this.programs.set(programs); + } +} diff --git a/projects/social_platform/src/app/api/project/dto/create-vacancy.model.ts b/projects/social_platform/src/app/api/project/dto/create-vacancy.model.ts new file mode 100644 index 00000000..b4f7081e --- /dev/null +++ b/projects/social_platform/src/app/api/project/dto/create-vacancy.model.ts @@ -0,0 +1,12 @@ +/** @format */ + +export interface CreateVacancyDto { + role: string; + requiredSkillsIds?: number[]; + description?: string; + requiredExperience: string; + workFormat: string; + workSchedule: string; + specialization?: string; + salary: number | null; +} diff --git a/projects/social_platform/src/app/api/project/facades/dashboard/projects-dashboard-info.service.ts b/projects/social_platform/src/app/api/project/facades/dashboard/projects-dashboard-info.service.ts new file mode 100644 index 00000000..55c2ac48 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/dashboard/projects-dashboard-info.service.ts @@ -0,0 +1,42 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { combineLatest, Subject, switchMap, takeUntil } from "rxjs"; +import { ActivatedRoute } from "@angular/router"; +import { AuthService } from "../../../auth"; +import { SubscriptionService } from "../../../subsriptions/subscription.service"; +import { ProjectsDashboardUIInfoService } from "./ui/projects-dashboard-ui-info.service"; + +@Injectable() +export class ProjectsDashboardInfoService { + private readonly route = inject(ActivatedRoute); + private readonly authService = inject(AuthService); + private readonly subscriptionService = inject(SubscriptionService); + private readonly projectsDashboardUIInfoService = inject(ProjectsDashboardUIInfoService); + + private readonly destroy$ = new Subject(); + + initializationDashboardItems(): void { + const subscriptions$ = this.authService.profile.pipe( + switchMap(p => this.subscriptionService.getSubscriptions(p.id)) + ); + + combineLatest([this.route.data, subscriptions$]) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: ([ + { + data: { all, my }, + }, + subs, + ]) => { + this.projectsDashboardUIInfoService.applySetDashboardItems(all, my, subs); + }, + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/dashboard/ui/projects-dashboard-ui-info.service.ts b/projects/social_platform/src/app/api/project/facades/dashboard/ui/projects-dashboard-ui-info.service.ts new file mode 100644 index 00000000..b756f6be --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/dashboard/ui/projects-dashboard-ui-info.service.ts @@ -0,0 +1,46 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { DashboardItem, dashboardItemBuilder } from "@utils/helpers/dashboardItemBuilder"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { ProgramDetailListUIInfoService } from "../../../../program/facades/detail/ui/program-detail-list-ui-info.service"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; + +@Injectable() +export class ProjectsDashboardUIInfoService { + private readonly programDetailListUIInfoService = inject(ProgramDetailListUIInfoService); + + readonly dashboardItems = signal([]); + + private readonly profileSubs = this.programDetailListUIInfoService.profileSubscriptions; + + applySetDashboardItems( + all: ApiPagination, + my: ApiPagination, + subs: ApiPagination + ): void { + this.profileSubs.set(subs.results); + + const allProjects = all.results.slice(0, 4); + const myProjects = my.results.slice(0, 4); + const subsProjects = subs.results.slice(0, 4); + + this.dashBoardItemsBuilder(allProjects, myProjects, subsProjects); + } + + private dashBoardItemsBuilder( + myProjects: Project[], + subsProjects: Project[], + allProjects: Project[] + ): void { + this.dashboardItems.set( + dashboardItemBuilder( + 3, + ["my", "subscriptions", "all"], + ["мои проекты", "мои подписки", "витрина проектов"], + ["main", "favourities", "folders"], + [myProjects, subsProjects, allProjects] + ) + ); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/detail/chat/projects-detail-chat.service.ts b/projects/social_platform/src/app/api/project/facades/detail/chat/projects-detail-chat.service.ts new file mode 100644 index 00000000..b6f6523b --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/detail/chat/projects-detail-chat.service.ts @@ -0,0 +1,14 @@ +/** @format */ + +import { Injectable } from "@angular/core"; +import { Subject } from "rxjs"; + +@Injectable() +export class ProjectsDetailChatService { + private readonly destroy$ = new Subject(); + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/detail/projects-detail.service.ts b/projects/social_platform/src/app/api/project/facades/detail/projects-detail.service.ts new file mode 100644 index 00000000..84936256 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/detail/projects-detail.service.ts @@ -0,0 +1,214 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { filter, map, Observable, Subject, takeUntil, tap } from "rxjs"; +import { ProjectService } from "../../project.service"; +import { AuthService } from "../../../auth"; +import { NavService } from "@ui/services/nav/nav.service"; +import { FeedNews } from "projects/social_platform/src/app/domain/project/project-news.model"; +import { ActivatedRoute } from "@angular/router"; +import { ProjectNewsService } from "../../project-news.service"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; +import { ExpandService } from "../../../expand/expand.service"; +import { ProjectsDetailUIInfoService } from "./ui/projects-detail-ui.service"; +import { NewsInfoService } from "../../../news/news-info.service"; + +@Injectable({ providedIn: "root" }) +export class ProjectsDetailService { + private readonly projectService = inject(ProjectService); + private readonly projectsDetailUIService = inject(ProjectsDetailUIInfoService); + private readonly authService = inject(AuthService); + private readonly navService = inject(NavService); + private readonly route = inject(ActivatedRoute); // Сервис для работы с активным маршрутом + private readonly projectNewsService = inject(ProjectNewsService); // Сервис новостей проекта + private readonly expandService = inject(ExpandService); + private readonly newsInfoService = inject(NewsInfoService); + + private observer?: IntersectionObserver; + private readonly destroy$ = new Subject(); + + private readonly project = this.projectsDetailUIService.project; + private readonly projectId = this.projectsDetailUIService.projectId; + + private readonly news = this.newsInfoService.news; + + destroy(): void { + this.observer?.disconnect(); + + this.destroy$.next(); + this.destroy$.complete(); + } + + initializationTeam(): void { + this.authService.profile + .pipe( + filter(profile => !!profile), + map(profile => profile.id), + takeUntil(this.destroy$) + ) + .subscribe({ + next: profileId => { + if (profileId) { + this.projectsDetailUIService.applySetLoggedUserId("logged", profileId); + } + }, + }); + } + + initializationProjectInfo(): void { + this.navService.setNavTitle("Профиль проекта"); + + this.projectsDetailUIService.applyDirectionItems(); + + this.initCheckDescription(); + + // Загрузка новостей проекта + this.initializationNews(); + + // Получение ID текущего пользователя + this.initializationProfile(); + } + + initializationNews(): void { + this.projectNewsService + .fetchNews(String(this.project()?.id)) + .pipe(takeUntil(this.destroy$)) + .subscribe(news => { + this.newsInfoService.applySetNews(news); + + // Настройка наблюдателя для отслеживания просмотра новостей + setTimeout(() => { + const observer = new IntersectionObserver(this.onNewsInVew.bind(this), { + root: document.querySelector(".office__body"), + rootMargin: "0px 0px 0px 0px", + threshold: 0, + }); + document.querySelectorAll(".news__item").forEach(e => { + observer.observe(e); + }); + }); + }); + } + + initializationProfile(): void { + this.authService.profile.pipe(takeUntil(this.destroy$)).subscribe(profile => { + this.projectsDetailUIService.applySetLoggedUserId("profile", profile.id); + }); + } + + initCheckDescription(): void { + setTimeout(() => { + this.expandService.checkExpandable("description", !!this.project()?.description); + }, 150); + } + + removeCollaboratorFromProject(userId: number): void { + const projectId = this.projectId(); + if (!projectId) return; + + this.projectService + .removeColloborator(this.projectId()!, userId) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => { + this.projectsDetailUIService.removeCollaborators(userId); + }, + }); + } + + /** + * Обработчик появления новостей в области видимости + * Отмечает новости как просмотренные + * @param entries - массив элементов, попавших в область видимости + */ + onNewsInVew(entries: IntersectionObserverEntry[]): void { + const ids = entries.map(e => { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + return e.target.dataset.id; + }); + + this.projectNewsService + .readNews(Number(this.project()?.id), ids) + .pipe(takeUntil(this.destroy$)) + .subscribe(); + } + + /** + * Добавление новой новости + * @param news - объект с текстом и файлами новости + */ + onAddNews(news: { text: string; files: string[] }) { + return this.projectNewsService.addNews(this.projectId()!.toString(), news).pipe( + tap(newsRes => this.newsInfoService.applyAddNews(newsRes)), + takeUntil(this.destroy$) + ); + } + + /** + * Удаление новости + * @param newsId - ID удаляемой новости + */ + onDeleteNews(newsId: number): void { + this.newsInfoService.applyDeleteNews(newsId); + + this.projectNewsService + .delete(this.projectId()!.toString(), newsId) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => {}); + } + + /** + * Переключение лайка новости + * @param newsId - ID новости для лайка + */ + onLike(newsId: number) { + const item = this.news().find(n => n.id === newsId); + if (!item) return; + + this.projectNewsService + .toggleLike(this.projectId()!.toString(), newsId, !item.isUserLiked) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.newsInfoService.applyLikeNews(newsId); + }); + } + + /** + * Редактирование новости + * @param news - обновленные данные новости + * @param newsItemId - ID редактируемой новости + */ + onEditNews(news: FeedNews, newsItemId: number): Observable { + return this.projectNewsService.editNews(this.projectId()!.toString(), newsItemId, news).pipe( + tap(resNews => this.newsInfoService.applyEditNews(resNews)), + takeUntil(this.destroy$) + ); + } + + /** + * Удаление участника из проекта + * @param id - ID удаляемого участника + */ + onRemoveMember(id: Collaborator["userId"]) { + this.projectService + .removeColloborator(this.projectId()!, id) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.projectsDetailUIService.applyMembersManipulation(id); + }); + } + + /** + * Передача лидерства другому участнику + * @param id - ID нового лидера + */ + onTransferOwnership(id: Collaborator["userId"]) { + this.projectService + .switchLeader(this.projectId()!, id) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.projectsDetailUIService.applyMembersManipulation(id); + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/detail/ui/projects-detail-ui.service.ts b/projects/social_platform/src/app/api/project/facades/detail/ui/projects-detail-ui.service.ts new file mode 100644 index 00000000..b5cf88f5 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/detail/ui/projects-detail-ui.service.ts @@ -0,0 +1,77 @@ +/** @format */ + +import { computed, Injectable, signal } from "@angular/core"; +import { DirectionItem, directionItemBuilder } from "@utils/helpers/directionItemBuilder"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; + +@Injectable({ providedIn: "root" }) +export class ProjectsDetailUIInfoService { + readonly collaborators = computed(() => this.project()?.collaborators); + readonly vacancies = computed(() => this.project()?.vacancies); + readonly leaderId = computed(() => this.project()?.leader); + readonly projectId = computed(() => this.project()?.id); + readonly goals = computed(() => this.project()?.goals); + + readonly project = signal(undefined); + readonly loggedUserId = signal(0); + + readonly profileId = signal(0); // ID текущего пользователя + + // Состояние компонента + readonly isCompleted = signal(false); // Флаг завершенности проекта + readonly directions = signal([]); + + applySetProject(project: Project) { + this.project.set(project); + } + + applySetLoggedUserId(type: "logged" | "profile", profileId: number): void { + type === "logged" ? this.loggedUserId.set(profileId) : this.profileId.set(profileId); + } + + applyDirectionItems(): void { + this.directions.set( + directionItemBuilder( + 5, + ["проблема", "целевая аудитория", "актуаль-сть", "цели", "партнеры"], + ["key", "smile", "graph", "goal", "team"], + [ + this.project()!.problem, + this.project()!.targetAudience, + this.project()!.actuality, + this.project()!.goals, + this.project()!.partners, + ], + ["string", "string", "string", "array", "array"] + ) ?? [] + ); + } + + applyRemoveCollaborator(userId: number): void { + this.project.update(project => { + if (!project) return; + + return { + ...project, + collaborators: this.collaborators()?.filter(c => c.userId !== userId) ?? [], + }; + }); + } + + applyMembersManipulation(id: number): void { + this.project.update(p => + p ? { ...p, collaborators: p.collaborators.filter(c => c.userId !== id) } : p + ); + } + + removeCollaborators(userId: number): void { + this.project.update(project => { + if (!project) return; + + return { + ...project, + collaborators: this.collaborators()?.filter(c => c.userId !== userId) ?? [], + }; + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/detail/work-section/projects-detail-work-section-info.service.ts b/projects/social_platform/src/app/api/project/facades/detail/work-section/projects-detail-work-section-info.service.ts new file mode 100644 index 00000000..d4658956 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/detail/work-section/projects-detail-work-section-info.service.ts @@ -0,0 +1,67 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { map, Subject, takeUntil } from "rxjs"; +import { VacancyService } from "../../../../vacancy/vacancy.service"; +import { ActivatedRoute } from "@angular/router"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; +import { ProjectsDetailWorkSectionUIInfoService } from "./ui/projects-detail-work-section-ui-info.service"; + +@Injectable() +export class ProjectsDetailWorkSectionInfoService { + private readonly route = inject(ActivatedRoute); + private readonly vacancyService = inject(VacancyService); + private readonly projectsDetailWorkSectionUIInfoService = inject( + ProjectsDetailWorkSectionUIInfoService + ); + + private readonly destroy$ = new Subject(); + + readonly projectId = signal(undefined); + + initializationWorkSection(): void { + this.route.data + .pipe( + map(r => r["data"]), + takeUntil(this.destroy$) + ) + .subscribe({ + next: (responses: VacancyResponse[]) => { + this.projectsDetailWorkSectionUIInfoService.applyInitVacancies(responses); + }, + }); + + this.projectId.set(this.route.parent?.snapshot.params["projectId"]); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Принятие отклика на вакансию + * @param responseId - ID отклика для принятия + */ + acceptResponse(responseId: number) { + this.vacancyService + .acceptResponse(responseId) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.projectsDetailWorkSectionUIInfoService.applyFilterVacacnies(responseId); + }); + } + + /** + * Отклонение отклика на вакансию + * @param responseId - ID отклика для отклонения + */ + rejectResponse(responseId: number) { + this.vacancyService + .rejectResponse(responseId) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.projectsDetailWorkSectionUIInfoService.applyFilterVacacnies(responseId); + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/detail/work-section/ui/projects-detail-work-section-ui-info.service.ts b/projects/social_platform/src/app/api/project/facades/detail/work-section/ui/projects-detail-work-section-ui-info.service.ts new file mode 100644 index 00000000..b21c0c49 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/detail/work-section/ui/projects-detail-work-section-ui-info.service.ts @@ -0,0 +1,19 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; + +@Injectable() +export class ProjectsDetailWorkSectionUIInfoService { + readonly vacancies = signal([]); + + applyInitVacancies(responses: VacancyResponse[]): void { + this.vacancies.set( + responses.filter((response: VacancyResponse) => response.isApproved === null) + ); + } + + applyFilterVacacnies(responseId: number): void { + this.vacancies.update(vacancies => vacancies.filter(vacancy => vacancy.id !== responseId)); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-achievements.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-achievements.service.ts new file mode 100644 index 00000000..95af4a7d --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-achievements.service.ts @@ -0,0 +1,163 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { FormArray, FormBuilder, FormGroup } from "@angular/forms"; +import { ProjectFormService } from "./project-form.service"; + +/** + * Сервис для управления достижениями проекта. + * Предоставляет методы для добавления, редактирования, удаления достижений, + * а также очистки ошибок валидации. + */ +@Injectable({ + providedIn: "root", +}) +export class ProjectAchievementsService { + /** FormBuilder для создания FormGroup элементов */ + private readonly fb = inject(FormBuilder); + /** Сервис для управления индексом редактируемого достижения */ + private readonly projectFormService = inject(ProjectFormService); + /** Сигнал для хранения списка достижений (массив объектов) */ + public readonly achievementsItems = signal([]); + private initialized = false; + + /** + * Инициализирует сигнал achievementsItems из данных FormArray + * Вызывается при первом обращении к данным + */ + private initializeAchievementsItems(achievementsFormArray: FormArray): void { + if (this.initialized) return; + + if (achievementsFormArray && achievementsFormArray.length > 0) { + // Синхронизируем сигнал с данными из FormArray + this.achievementsItems.set(achievementsFormArray.value); + } + this.initialized = true; + } + + /** + * Принудительно синхронизирует сигнал с FormArray + * Полезно вызывать после загрузки данных с сервера + */ + public syncAchievementsItems(achievementsFormArray: FormArray): void { + if (achievementsFormArray) { + this.achievementsItems.set(achievementsFormArray.value); + } + } + + private readonly achievements = this.projectFormService.achievements; + readonly hasAchievements = computed( + () => this.achievementsItems().length > 0 || this.achievements.length > 0 + ); + + /** + * Добавляет новое достижение или сохраняет изменения существующего. + * @param achievementsFormArray FormArray, содержащий формы достижений + * @param projectForm основная форма проекта (FormGroup) + */ + public addAchievement(achievementsFormArray: FormArray, projectForm: FormGroup): void { + // Инициализируем сигнал при первом вызове + this.initializeAchievementsItems(achievementsFormArray); + + // Считываем вводимые данные + const title = projectForm.get("title")?.value; + const status = projectForm.get("status")?.value; + + // Проверяем, что поля не пустые + if (!title || !status || title.trim().length === 0 || status.trim().length === 0) { + return; // Выходим из функции, если поля пустые + } + + // Создаем FormGroup для нового достижения + const achievementItem = this.fb.group({ + id: achievementsFormArray.length, + title: title.trim(), + status: status.trim(), + }); + + // Проверяем, редактируется ли существующее достижение + const editIdx = this.projectFormService.editIndex(); + if (editIdx !== null) { + // Обновляем массив сигналов и соответствующий контрол в FormArray + this.achievementsItems.update(items => { + const updated = [...items]; + updated[editIdx] = achievementItem.value; + return updated; + }); + achievementsFormArray.at(editIdx).patchValue(achievementItem.value); + // Сбрасываем индекс редактирования + this.projectFormService.editIndex.set(null); + } else { + // Добавляем новое достижение в сигнал и FormArray + this.achievementsItems.update(items => [...items, achievementItem.value]); + achievementsFormArray.push(achievementItem); + } + + // Очищаем поля ввода формы проекта + projectForm.get("title")?.reset(); + projectForm.get("title")?.setValue(""); + + projectForm.get("status")?.reset(); + projectForm.get("status")?.setValue(""); + } + + /** + * Инициализирует редактирование существующего достижения. + * @param index индекс достижения в списке + * @param achievementsFormArray FormArray достижений + * @param projectForm основная форма проекта + */ + public editAchievement( + index: number, + achievementsFormArray: FormArray, + projectForm: FormGroup + ): void { + // Инициализируем сигнал при необходимости + this.initializeAchievementsItems(achievementsFormArray); + + // Используем данные из FormArray как источник истины + const source = achievementsFormArray.value[index]; + + // Заполняем поля формы проекта для редактирования + projectForm.patchValue({ + achievementsName: source?.achievementsName || "", + achievementsDate: source?.achievementsDate || "", + }); + // Устанавливаем текущий индекс редактирования в сервисе + this.projectFormService.editIndex.set(index); + } + + /** + * Удаляет достижение по указанному индексу. + * @param index индекс удаляемого достижения + * @param achievementsFormArray FormArray достижений + */ + public removeAchievement(index: number, achievementsFormArray: FormArray): void { + // Удаляем из сигнала и из FormArray + this.achievementsItems.update(items => items.filter((_, i) => i !== index)); + achievementsFormArray.removeAt(index); + } + + /** + * Сбрасывает все ошибки валидации во всех контролах FormArray достижений. + * @param achievements FormArray достижений + */ + public clearAllAchievementsErrors(achievements: FormArray): void { + achievements.controls.forEach(control => { + if (control instanceof FormGroup) { + Object.keys(control.controls).forEach(key => { + control.get(key)?.setErrors(null); + }); + } + }); + } + + /** + * Сбрасывает состояние сервиса + * Полезно при смене проекта или очистке формы + */ + public reset(): void { + this.achievementsItems.set([]); + this.initialized = false; + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-additional.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-additional.service.ts new file mode 100644 index 00000000..b37db560 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-additional.service.ts @@ -0,0 +1,221 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; +import { + PartnerProgramFields, + PartnerProgramFieldsValues, + projectNewAdditionalProgramVields, +} from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { Observable } from "rxjs"; +import { ProgramService } from "../../../program/program.service"; + +/** + * Сервис для управления дополнительными полями проекта в партнерской программе. + * Предоставляет методы для инициализации формы, валидации, переключения значений, + * подготовки к отправке и работы со статусами отправки и ошибок. + */ +@Injectable() +export class ProjectAdditionalService { + private additionalForm!: FormGroup; + readonly partnerProgramFields = signal([]); + private partnerProgramFieldsValues: PartnerProgramFieldsValues[] = []; + + private readonly fb = inject(FormBuilder); + private readonly projectService = inject(ProjectService); + private readonly programService = inject(ProgramService); + + readonly isSendingDecision = signal(false); + readonly isAssignProjectToProgramError = signal(false); + readonly errorAssignProjectToProgramModalMessage = signal<{ non_field_errors: string[] } | null>( + null + ); + + constructor() { + // Инициализируем пустую форму + this.additionalForm = this.fb.group({}); + } + + /** + * Возвращает форму дополнительных полей. + */ + public getAdditionalForm(): FormGroup { + return this.additionalForm; + } + + /** + * Возвращает массив сохраненных значений полей. + */ + public getPartnerProgramFieldsValues(): PartnerProgramFieldsValues[] { + return this.partnerProgramFieldsValues; + } + + /** + * Инициализирует форму дополнительных полей согласно конфигурации и значениям. + * @param fields описание полей партнерской программы + * @param values сохраненные значения полей + */ + public initializeAdditionalForm( + fields: PartnerProgramFields[], + values: PartnerProgramFieldsValues[] = [] + ): void { + this.partnerProgramFields.set(fields); + this.partnerProgramFieldsValues = values; + + // Создаем новую пустую форму + this.additionalForm = this.fb.group({}); + + // Добавляем контролы для каждого поля + this.partnerProgramFields().forEach(field => { + this.getInitialValue(field, values); + const validators = field.isRequired ? [Validators.required] : []; + const initialValue = this.getInitialValue(field, values); + + this.additionalForm.addControl(field.name, new FormControl(initialValue, validators)); + + // Добавляем дополнительную валидацию по типу поля + this.addFieldTypeValidators(field); + }); + + // Применяем валидацию ко всей форме + this.additionalForm.updateValueAndValidity(); + } + + /** + * Переключает значение для checkbox и radio полей. + * @param fieldType тип поля (checkbox | radio и др.) + * @param fieldName имя контрола в форме + */ + public toggleAdditionalFormValues( + fieldType: "text" | "textarea" | "checkbox" | "select" | "radio" | "file", + fieldName: string + ): void { + if (fieldType === "checkbox" || fieldType === "radio") { + const control = this.additionalForm.get(fieldName); + if (control) { + control.setValue(!control.value); + } + } + } + + /** + * Проверяет обязательные поля на валидность и помечает их как touched. + * @returns true если есть невалидные обязательные поля + */ + public validateRequiredFields(): boolean { + this.additionalForm.updateValueAndValidity(); + this.partnerProgramFields() + .filter(f => f.isRequired) + .forEach(f => this.additionalForm.get(f.name)?.markAsTouched()); + + return this.partnerProgramFields() + .filter(f => f.isRequired) + .some(f => this.additionalForm.get(f.name)?.invalid); + } + + /** + * Убирает валидаторы с заполненных обязательных полей перед отправкой. + */ + public prepareFieldsForSubmit(): void { + this.partnerProgramFields() + .filter(f => f.isRequired) + .forEach(f => { + const ctrl = this.additionalForm.get(f.name); + if (ctrl && ctrl.value) { + ctrl.clearValidators(); + ctrl.updateValueAndValidity({ emitEvent: false }); + } + }); + } + + /** + * Отправляет значения дополнительных полей на сервер. + * @param projectId идентификатор проекта + * @returns Observable результат запроса + */ + public sendAdditionalFieldsValues(projectId: number): Observable { + this.isSendingDecision.set(true); + const newFieldsFormValues: projectNewAdditionalProgramVields[] = []; + + this.partnerProgramFields().forEach((field: PartnerProgramFields) => { + const fieldValue = this.additionalForm.get(field.name)?.value; + newFieldsFormValues.push({ + field_id: field.id, + value_text: String(fieldValue), + }); + }); + + return this.projectService.sendNewProjectFieldsValues(projectId, newFieldsFormValues); + } + + /** + * Сабмитит проект привязанный к конкурсной программе + * @param relationId идентификатор связи + * @returns Observable результат запроса + */ + public submitCompettetiveProject(relationId: number): Observable { + return this.programService.submitCompettetiveProject(relationId); + } + + /** + * Сбрасывает флаг процесса отправки. + */ + public resetSendingState(): void { + this.isSendingDecision.set(false); + } + + /** + * Устанавливает сообщение и флаг ошибки при привязке проекта. + * @param error объект с массивом полей non_field_errors + */ + public setAssignProjectToProgramError(error: { non_field_errors: string[] }): void { + this.errorAssignProjectToProgramModalMessage.set(error); + this.isAssignProjectToProgramError.set(true); + } + + /** + * Сбрасывает сообщение и флаг ошибки при привязке проекта. + */ + public clearAssignProjectToProgramError(): void { + this.errorAssignProjectToProgramModalMessage.set(null); + this.isAssignProjectToProgramError.set(false); + } + + /** + * Вычисляет начальное значение контрола по сохраненным данным или типу поля. + * @param field описание поля + * @param values массив сохраненных значений + * @returns первоначальное значение контрола + */ + private getInitialValue(field: PartnerProgramFields, values: PartnerProgramFieldsValues[]): any { + const saved = values.find(v => v.fieldName === field.name); + if (!saved) { + return field.fieldType === "checkbox" || field.fieldType === "radio" ? false : ""; + } + + const text = saved.value.trim().toLowerCase(); + if (field.fieldType === "checkbox" || field.fieldType === "radio") { + return text === "true"; + } + return saved.value; + } + + /** + * Добавляет валидаторы по типу текстового поля. + * @param field описание поля для обработки валидаторов + */ + private addFieldTypeValidators(field: PartnerProgramFields): void { + const control = this.additionalForm.get(field.name); + if (!control) return; + + switch (field.fieldType) { + case "text": + control.addValidators([Validators.maxLength(500)]); + break; + case "textarea": + control.addValidators([Validators.maxLength(300)]); + break; + } + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-contacts.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-contacts.service.ts new file mode 100644 index 00000000..45617555 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-contacts.service.ts @@ -0,0 +1,136 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { FormArray, FormBuilder, FormGroup, FormControl, Validators } from "@angular/forms"; +import { ProjectFormService } from "./project-form.service"; + +/** + * Сервис для управления контактами проекта. + * Предоставляет методы для добавления, редактирования, удаления ссылок, + * а также очистки ошибок валидации. + */ +@Injectable({ + providedIn: "root", +}) +export class ProjectContactsService { + /** FormBuilder для создания FormGroup элементов */ + private readonly fb = inject(FormBuilder); + /** Сервис для управления индексом редактируемой ссылки */ + private readonly projectFormService = inject(ProjectFormService); + /** Сигнал для хранения списка ссылок (массив объектов) */ + public readonly linksItems = signal([]); + private initialized = false; + + /** + * Инициализирует сигнал linksItems из данных FormArray + * Вызывается при первом обращении к данным + */ + private initializeLinksItems(linksFormArray: FormArray): void { + if (this.initialized) return; + + if (linksFormArray && linksFormArray.length > 0) { + // Синхронизируем сигнал с данными из FormArray + this.linksItems.set(linksFormArray.value); + } + this.initialized = true; + } + + /** + * Принудительно синхронизирует сигнал с FormArray + * Полезно вызывать после загрузки данных с сервера + */ + public syncLinksItems(linksFormArray: FormArray): void { + if (linksFormArray) { + this.linksItems.set(linksFormArray.value); + } + } + + readonly hasLinks = computed(() => this.linksItems().length > 0); + + /** + * Получает основную форму проекта + */ + private get projectForm(): FormGroup { + return this.projectFormService.getForm(); + } + + /** + * Получает FormArray ссылок + */ + public get links(): FormArray { + return this.projectForm.get("links") as FormArray; + } + + /** + * Получает FormControl для поля ввода ссылки + */ + public get link(): FormControl { + return this.projectForm.get("link") as FormControl; + } + + /** + * Добавляет новую ссылку или сохраняет изменения существующей. + * @param linksFormArray FormArray, содержащий формы ссылок + * @param projectForm основная форма проекта (FormGroup) + */ + public addLink(linksFormArray: FormArray): void { + this.initializeLinksItems(linksFormArray); + linksFormArray.push(this.fb.control("", Validators.required)); + this.linksItems.update(items => [...items, ""]); + } + + /** + * Инициализирует редактирование существующей ссылки. + * @param index индекс ссылки в списке + * @param linksFormArray FormArray ссылок + * @param projectForm основная форма проекта + */ + public editLink(index: number, linksFormArray: FormArray, projectForm: FormGroup): void { + // Инициализируем сигнал при необходимости + this.initializeLinksItems(linksFormArray); + + // Используем данные из FormArray как источник истины + const source = linksFormArray.value[index]; + + // Заполняем поле формы проекта для редактирования + projectForm.patchValue({ + link: source?.link || "", + }); + // Устанавливаем текущий индекс редактирования в сервисе + this.projectFormService.editIndex.set(index); + } + + /** + * Удаляет ссылку по указанному индексу. + * @param index индекс удаляемой ссылки + * @param linksFormArray FormArray ссылок + */ + public removeLink(index: number, linksFormArray: FormArray): void { + // Удаляем из сигнала и из FormArray + this.linksItems.update(items => items.filter((_, i) => i !== index)); + linksFormArray.removeAt(index); + } + + /** + * Сбрасывает все ошибки валидации во всех контролах FormArray ссылок. + * @param links FormArray ссылок + */ + public clearAllLinksErrors(links: FormArray): void { + links.controls.forEach(control => { + if (control instanceof FormGroup) { + Object.keys(control.controls).forEach(key => { + control.get(key)?.setErrors(null); + }); + } + }); + } + + /** + * Сбрасывает состояние сервиса + * Полезно при смене проекта или очистке формы + */ + public reset(): void { + this.linksItems.set([]); + this.initialized = false; + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-form.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-form.service.ts new file mode 100644 index 00000000..17303b0f --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-form.service.ts @@ -0,0 +1,370 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { + FormBuilder, + FormGroup, + Validators, + FormArray, + FormControl, + ValidatorFn, +} from "@angular/forms"; +import { ActivatedRoute } from "@angular/router"; +import { PartnerProgramFields } from "projects/social_platform/src/app/domain/program/partner-program-fields.model"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { stripNullish } from "@utils/helpers/stripNull"; +import { concatMap, filter, Subject, takeUntil } from "rxjs"; +import { Project } from "../../../../domain/project/project.model"; +/** + * Сервис для управления основной формой проекта и формой дополнительных полей партнерской программы. + * Обеспечивает создание, инициализацию, валидацию, автосохранение, сброс и получение данных форм. + */ +@Injectable({ providedIn: "root" }) +export class ProjectFormService { + private projectForm!: FormGroup; + private additionalForm!: FormGroup; + private readonly fb = inject(FormBuilder); + private readonly route = inject(ActivatedRoute); + private readonly projectService = inject(ProjectService); + public editIndex = signal(null); + public relationId = signal(0); + + private readonly destroy$ = new Subject(); + + constructor() { + this.initializeForm(); + } + + /** + * Создает и настраивает основную форму проекта с набором контролов и валидаторов. + * Подписывается на изменения полей 'presentationAddress' и 'coverImageAddress' для автосохранения при очищении. + */ + private initializeForm(): void { + this.projectForm = this.fb.group({ + imageAddress: [""], + name: ["", [Validators.required]], + region: ["", [Validators.required]], + implementationDeadline: [null], + trl: [null], + links: this.fb.array([]), + link: ["", Validators.pattern(/^(https?:\/\/)/)], + industryId: [undefined, [Validators.required]], + description: ["", [Validators.required, Validators.minLength(0), Validators.maxLength(800)]], + presentationAddress: [""], + coverImageAddress: ["", [Validators.required]], + actuality: ["", [Validators.maxLength(400)]], + targetAudience: ["", [Validators.required, Validators.maxLength(400)]], + problem: ["", [Validators.required, Validators.maxLength(400)]], + partnerProgramId: [null], + achievements: this.fb.array([]), + title: [""], + status: [""], + + draft: [null], + }); + + // Автосохранение при очистке presentationAddress + this.presentationAddress?.valueChanges + .pipe( + filter(value => !value), + concatMap(() => + this.projectService.updateProject(Number(this.route.snapshot.params["projectId"]), { + presentationAddress: "", + draft: true, + }) + ), + takeUntil(this.destroy$) + ) + .subscribe(); + + // Автосохранение при очистке coverImageAddress + this.coverImageAddress?.valueChanges + .pipe( + filter(value => !value), + concatMap(() => + this.projectService.updateProject(Number(this.route.snapshot.params["projectId"]), { + coverImageAddress: "", + draft: true, + }) + ), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + /** + * Заполняет основную форму данными существующего проекта. + * @param project экземпляр Project с текущими данными + */ + public initializeProjectData(project: Project): void { + // Заполняем простые поля + this.projectForm.patchValue({ + imageAddress: project.imageAddress, + name: project.name, + region: project.region, + industryId: project.industry, + description: project.description, + implementationDeadline: project.implementationDeadline ?? null, + targetAudience: project.targetAudience ?? null, + actuality: project.actuality ?? "", + trl: project.trl ?? "", + problem: project.problem ?? "", + presentationAddress: project.presentationAddress, + coverImageAddress: project.coverImageAddress, + partnerProgramId: project.partnerProgram?.programId ?? null, + }); + + if (project.partnerProgram) { + this.relationId.set(project.partnerProgram?.programLinkId); + } + + this.populateLinksFormArray(project.links || []); + this.populateAchievementsFormArray(project.achievements || []); + } + + /** + * Заполняет FormArray ссылок данными из проекта + * @param links массив ссылок из проекта + */ + private populateLinksFormArray(links: string[]): void { + const linksFormArray = this.projectForm.get("links") as FormArray; + + while (linksFormArray.length !== 0) { + linksFormArray.removeAt(0); + } + + links.forEach(link => { + linksFormArray.push(this.fb.control(link, [Validators.required])); + }); + } + + /** + * Заполняет FormArray достижений данными из проекта + * @param achievements массив достижений из проекта + */ + private populateAchievementsFormArray(achievements: any[]): void { + const achievementsFormArray = this.projectForm.get("achievements") as FormArray; + const currentYear = new Date().getFullYear(); + + while (achievementsFormArray.length !== 0) { + achievementsFormArray.removeAt(0); + } + + achievements.forEach((achievement, index) => { + const achievementGroup = this.fb.group({ + id: achievement.id ?? index, + title: [achievement.title || "", Validators.required], + status: [ + achievement.status || "", + [ + Validators.required, + Validators.min(2000), + Validators.max(currentYear), + Validators.pattern(/^\d{4}$/), + ], + ], + }); + achievementsFormArray.push(achievementGroup); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Возвращает основную форму проекта. + * @returns FormGroup экземпляр формы проекта + */ + public getForm(): FormGroup { + return this.projectForm; + } + + /** + * Патчит частичные значения в основную форму. + * @param values объект с частичными значениями Project + */ + public patchFormValues(values: Partial): void { + this.projectForm.patchValue(values); + } + + /** + * Проверяет валидность основной формы проекта. + * @returns true если все контролы валидны + */ + public validateForm(): boolean { + return this.projectForm.valid; + } + + /** + * Получает текущее значение формы без null или undefined. + * @returns объект значений формы без nullish + */ + public getFormValue(): any { + return stripNullish(this.projectForm.value); + } + + // Геттеры для быстрого доступа к контролам основной формы + public get name() { + return this.projectForm.get("name"); + } + + public get region() { + return this.projectForm.get("region"); + } + + public get industry() { + return this.projectForm.get("industryId"); + } + + public get description() { + return this.projectForm.get("description"); + } + + public get actuality() { + return this.projectForm.get("actuality"); + } + + public get implementationDeadline() { + return this.projectForm.get("implementationDeadline"); + } + + public get problem() { + return this.projectForm.get("problem"); + } + + public get targetAudience() { + return this.projectForm.get("targetAudience"); + } + + public get trl() { + return this.projectForm.get("trl"); + } + + public get presentationAddress() { + return this.projectForm.get("presentationAddress"); + } + + public get coverImageAddress() { + return this.projectForm.get("coverImageAddress"); + } + + public get imageAddress() { + return this.projectForm.get("imageAddress"); + } + + public get partnerProgramId() { + return this.projectForm.get("partnerProgramId"); + } + + public get achievements(): FormArray { + return this.projectForm.get("achievements") as FormArray; + } + + public get links(): FormArray { + return this.projectForm.get("links") as FormArray; + } + + /** + * Очищает все ошибки валидации в основной форме и в массиве достижений. + */ + public clearAllValidationErrors(): void { + Object.keys(this.projectForm.controls).forEach(ctrl => { + this.projectForm.get(ctrl)?.setErrors(null); + }); + this.clearAchievementsErrors(this.achievements); + } + + /** + * Инициализирует форму дополнительных полей программы партнерства. + * @param partnerProgramFields массив метаданных полей + */ + public initializeAdditionalForm(partnerProgramFields: PartnerProgramFields[]): void { + this.additionalForm = this.fb.group({}); + partnerProgramFields.forEach(field => { + const validators: ValidatorFn[] = []; + if (field.isRequired) validators.push(Validators.required); + if (field.fieldType === "text") validators.push(Validators.maxLength(500)); + if (field.fieldType === "textarea") validators.push(Validators.maxLength(300)); + const initialValue = field.fieldType === "checkbox" ? false : ""; + const fieldCtrl = new FormControl(initialValue, validators); + this.additionalForm.addControl(field.name, fieldCtrl); + }); + this.additionalForm.updateValueAndValidity(); + } + + /** + * Возвращает форму дополнительных полей. + * @returns FormGroup экземпляр дополнительной формы + */ + public getAdditionalForm(): FormGroup { + return this.additionalForm; + } + + /** + * Проверяет валидность дополнительной формы. + * @returns true если форма инициализирована и валидна + */ + public validateAdditionalForm(): boolean { + return this.additionalForm?.valid ?? true; + } + + /** + * Возвращает очищенные значения дополнительной формы. + * @returns объект значений без nullish + */ + public getAdditionalFormValue(): any { + return this.additionalForm ? stripNullish(this.additionalForm.value) : {}; + } + + /** + * Сбрасывает основную и дополнительную формы в первоначальное состояние. + */ + public resetForms(): void { + this.projectForm.reset(); + this.additionalForm?.reset(); + this.clearFormArrays(); + } + + /** + * Очищает все FormArray в форме + */ + private clearFormArrays(): void { + const linksArray = this.links; + const achievementsArray = this.achievements; + + while (linksArray.length !== 0) { + linksArray.removeAt(0); + } + + while (achievementsArray.length !== 0) { + achievementsArray.removeAt(0); + } + } + + /** + * Проверяет валидность обеих форм (основной и дополнительной) включая цели. + * @returns true если все формы валидны + */ + public validateAllForms(): boolean { + const mainFormValid = this.validateForm(); + const additionalFormValid = this.validateAdditionalForm(); + + return mainFormValid && additionalFormValid; + } + + /** + * Удаляет ошибки валидации внутри массива достижений. + * @param achievements FormArray достижений + */ + private clearAchievementsErrors(achievements: FormArray): void { + achievements.controls.forEach(group => { + if (group instanceof FormGroup) { + Object.keys(group.controls).forEach(name => { + group.get(name)?.setErrors(null); + }); + } + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-goals.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-goals.service.ts new file mode 100644 index 00000000..baa6ca26 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-goals.service.ts @@ -0,0 +1,301 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; +import { ProjectFormService } from "./project-form.service"; +import { catchError, forkJoin, map, of, Subject, takeUntil, tap } from "rxjs"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { Goal, GoalDto } from "../../../../domain/project/goals.model"; +import { ProjectGoalsUIService } from "./ui/project-goals-ui.service"; + +/** + * Сервис для управления целями проекта + * Предоставляет полный набор методов для работы с целями: + * - инициализация, добавление, редактирование, удаление + * - валидация и очистка ошибок + * - управление состоянием модального окна выбора лидера + */ +@Injectable({ + providedIn: "root", +}) +export class ProjectGoalService { + private readonly fb = inject(FormBuilder); + private goalForm!: FormGroup; + private readonly projectFormService = inject(ProjectFormService); + private readonly projectService = inject(ProjectService); + private readonly projectGoalsUIService = inject(ProjectGoalsUIService); + + private readonly destroy$ = new Subject(); + + /** Флаг инициализации сервиса */ + private initialized = false; + private readonly goalItems = this.projectGoalsUIService.goalItems; + + constructor() { + this.initializeGoalForm(); + } + + private initializeGoalForm(): void { + this.goalForm = this.fb.group({ + goals: this.fb.array([]), + title: [null], + completionDate: [null], + responsible: [null], + }); + } + + /** + * Инициализирует сигнал goalItems из данных FormArray + * Вызывается при первом обращении к данным + */ + public initializeGoalItems(goalFormArray: FormArray): void { + if (this.initialized) return; + + if (goalFormArray && goalFormArray.length > 0) { + this.goalItems.set(goalFormArray.value); + } + this.initialized = true; + } + + /** + * Принудительно синхронизирует сигнал с FormArray + * Полезно вызывать после загрузки данных с сервера + */ + public syncGoalItems(goalFormArray: FormArray): void { + if (goalFormArray) { + this.goalItems.set(goalFormArray.value); + } + } + + /** + * Инициализирует цели из данных проекта + * Заполняет FormArray целей данными из проекта + */ + public initializeGoalsFromProject(goals: Goal[]): void { + const goalsFormArray = this.goals; + + while (goalsFormArray.length !== 0) { + goalsFormArray.removeAt(0); + } + + if (goals && Array.isArray(goals)) { + goals.forEach(goal => { + const goalsGroup = this.fb.group({ + id: [goal.id ?? null], + title: [goal.title || "", Validators.required], + completionDate: [goal.completionDate || "", Validators.required], + responsible: [goal.responsibleInfo?.id?.toString() || "", Validators.required], + isDone: [goal.isDone || false], + }); + goalsFormArray.push(goalsGroup); + }); + + this.syncGoalItems(goalsFormArray); + } else { + this.goalItems.set([]); + } + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Возвращает форму целей. + * @returns FormGroup экземпляр формы целей + */ + public getForm(): FormGroup { + return this.goalForm; + } + + /** + * Получает FormArray целей + */ + public get goals(): FormArray { + return this.goalForm.get("goals") as FormArray; + } + + /** + * Получает FormControl для поля ввода названия цели + */ + public get goalName(): FormControl { + return this.goalForm.get("title") as FormControl; + } + + /** + * Получает FormControl для поля ввода даты цели + */ + public get goalDate(): FormControl { + return this.goalForm.get("completionDate") as FormControl; + } + + /** + * Получает FormControl для поля лидера(исполнителя/ответственного) цели + */ + public get goalLeader(): FormControl { + return this.goalForm.get("responsible") as FormControl; + } + + /** + * Добавляет новую цель или сохраняет изменения существующей. + * @param goalName - название цели (опционально) + * @param goalDate - дата цели (опционально) + * @param goalLeader - лидер цели (опционально) + */ + public addGoal(goalName?: string, goalDate?: string, goalLeader?: string): void { + const goalFormArray = this.goals; + + this.initializeGoalItems(goalFormArray); + + const name = goalName || this.goalForm.get("title")?.value; + const date = goalDate || this.goalForm.get("completionDate")?.value; + const leader = goalLeader || this.goalForm.get("responsible")?.value; + + if (!name || !date || name.trim().length === 0 || date.trim().length === 0) { + return; + } + + const goalItem = this.fb.group({ + id: [null], + title: [name.trim(), Validators.required], + completionDate: [date.trim(), Validators.required], + responsible: [leader, Validators.required], + isDone: [false], + }); + + const editIdx = this.projectFormService.editIndex(); + if (editIdx !== null) { + goalFormArray.at(editIdx).patchValue(goalItem.value); + this.projectFormService.editIndex.set(null); + } else { + this.goalItems.update(items => [...items, goalItem.value]); + goalFormArray.push(goalItem); + } + + this.syncGoalItems(goalFormArray); + } + + /** + * Удаляет цель по указанному индексу. + * @param index индекс удаляемой цели + */ + public removeGoal(index: number, goalId: number, projectId: number): void { + const goalFormArray = this.goals; + + this.goalItems.update(items => items.filter((_, i) => i !== index)); + goalFormArray.removeAt(index); + + this.projectService.deleteGoals(projectId, goalId).pipe(takeUntil(this.destroy$)).subscribe(); + } + + /** + * Получает выбранного лидера для конкретной цели + * @param goalIndex - индекс цели + * @param collaborators - список коллабораторов + */ + public getSelectedLeaderForGoal(goalIndex: number, collaborators: any[]) { + const goalFormGroup = this.goals.at(goalIndex); + const leaderId = goalFormGroup?.get("responsible")?.value; + + if (!leaderId) return null; + + return collaborators.find(collab => collab.userId.toString() === leaderId.toString()); + } + + /** + * Сбрасывает все ошибки валидации во всех контролах FormArray цели. + */ + public clearAllGoalsErrors(): void { + const goals = this.goals; + + goals.controls.forEach(control => { + if (control instanceof FormGroup) { + Object.keys(control.controls).forEach(key => { + control.get(key)?.setErrors(null); + }); + } + }); + } + + /** + * Получает данные всех целей для отправки на сервер + * @returns массив объектов целей + */ + public getGoalsData(): any[] { + return this.goals.value.map((g: any) => ({ + id: g.id ?? null, + title: g.title, + completionDate: g.completionDate, + responsible: + g.responsible === null || g.responsible === undefined || g.responsible === "" + ? null + : Number(g.responsible), + isDone: !!g.isDone, + })); + } + + /** + * Сохраняет только новые цели (у которых id === null) — отправляет POST. + * После ответов присваивает полученные id в соответствующие FormGroup. + * Возвращает Observable массива результатов (в порядке отправки). + */ + public saveGoals(projectId: number, newGoals: Goal[]) { + return this.projectService.addGoals(projectId, newGoals).pipe( + tap(results => { + results.forEach((createdGoal: any, idx: number) => { + const formGroup = this.goals.at(idx); + if (formGroup && createdGoal?.id != null) { + formGroup.patchValue({ id: createdGoal.id }); + } + }); + }), + catchError(err => { + console.error("Error saving goals:", err); + return of({ __error: true, err, original: newGoals }); + }) + ); + } + + public editGoals(projectId: number, existingGoals: Goal[]) { + const requests = existingGoals.map((item, idx) => { + const payload: GoalDto = { + id: item.id, + title: item.title, + completionDate: item.completionDate, + responsible: item.responsible, + isDone: item.isDone, + }; + + return this.projectService.editGoal(projectId, item.id, payload).pipe( + map(res => ({ res, idx })), + catchError(err => of({ __error: true, err, original: item, idx })) + ); + }); + + return forkJoin(requests); + } + + /** + * Сбрасывает состояние сервиса + * Полезно при смене проекта или очистке формы + */ + public reset(): void { + this.goalItems.set([]); + this.initialized = false; + this.projectGoalsUIService.applyCloseGoalLeaderModal(); + } + + /** + * Очищает FormArray целей + */ + public clearGoalsFormArray(): void { + const goalFormArray = this.goals; + + while (goalFormArray.length !== 0) { + goalFormArray.removeAt(0); + } + + this.goalItems.set([]); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-partner.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-partner.service.ts new file mode 100644 index 00000000..eb63b400 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-partner.service.ts @@ -0,0 +1,279 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { catchError, forkJoin, map, of, Subject, takeUntil, tap } from "rxjs"; +import { Partner, PartnerDto } from "../../../../domain/project/partner.model"; + +@Injectable({ + providedIn: "root", +}) +export class ProjectPartnerService { + private readonly fb = inject(FormBuilder); + private partnerForm!: FormGroup; + private readonly projectService = inject(ProjectService); + public readonly partnerItems = signal< + Partial<{ id: null; name: string; inn: string; contribution: string; decisionMaker: string }>[] + >([]); + + private readonly destroy$ = new Subject(); + + /** Флаг инициализации сервиса */ + private initialized = false; + + constructor() { + this.initializePartnerForm(); + } + + private initializePartnerForm(): void { + this.partnerForm = this.fb.group({ + partners: this.fb.array([]), + name: [null], + inn: [null, [Validators.minLength(10), Validators.maxLength(10)]], + contribution: [null, Validators.maxLength(200)], + decisionMaker: [null], + }); + } + + /** + * Инициализирует сигнал partnerItems из данных FormArray + * Вызывается при первом обращении к данным + */ + public initializePartnerItems(partnerFormArray: FormArray): void { + if (this.initialized) return; + + if (partnerFormArray && this.partnerItems().length > 0) { + this.partnerItems.set(partnerFormArray.value); + } + + this.initialized = true; + } + + /** + * Принудительно синхронизирует сигнал с FormArray + * Полезно вызывать после загрузки данных с сервера + */ + public syncPartnerItems(partnerFormArray: FormArray): void { + if (partnerFormArray) { + this.partnerItems.set(partnerFormArray.value); + } + } + + /** + * Инициализирует партнера из данных проекта + * Заполняет FormArray целей данными из проекта + */ + public initializePartnerFromProject(partners: Partner[]): void { + const partnerFormArray = this.partners; + + while (partnerFormArray.length !== 0) { + partnerFormArray.removeAt(0); + } + + if (partners && Array.isArray(partners)) { + partners.forEach(partner => { + const partnerGroup = this.fb.group({ + id: [partner.id], + name: [partner.company.name, Validators.required], + inn: [partner.company.inn, Validators.required], + contribution: [partner.contribution, Validators.required], + company: [partner.company], + decisionMaker: [ + "https://app.procollab.ru/office/profile/" + partner.decisionMaker, + Validators.required, + ], + }); + partnerFormArray.push(partnerGroup); + }); + + this.syncPartnerItems(partnerFormArray); + } else { + this.partnerItems.set([]); + } + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + readonly hasPartners = computed(() => this.partnerItems().length > 0); + + /** + * Возвращает форму партнеров и ресурсов. + * @returns FormGroup экземпляр формы целей + */ + public getForm(): FormGroup { + return this.partnerForm; + } + + /** + * Получает FormArray партнеров и ресурсов + */ + public get partners(): FormArray { + return this.partnerForm.get("partners") as FormArray; + } + + public get partnerName(): FormControl { + return this.partnerForm.get("name") as FormControl; + } + + public get partnerINN(): FormControl { + return this.partnerForm.get("inn") as FormControl; + } + + public get partnerMention(): FormControl { + return this.partnerForm.get("contribution") as FormControl; + } + + public get partnerProfileLink(): FormControl { + return this.partnerForm.get("decisionMaker") as FormControl; + } + + /** + * Добавляет нового партнера или сохраняет изменения существующей. + * @param name - название партнера (опционально) + * @param inn - инн (опционально) + * @param contribution - вклад партнера (опционально) + * @param decisionMaker - ссылка на профиль представителя компании (опционально) + */ + public addPartner( + name?: string, + inn?: string, + contribution?: string, + decisionMaker?: string + ): void { + const partnerFormArray = this.partners; + + this.initializePartnerItems(partnerFormArray); + + const partnerName = name || this.partnerForm.get("name")?.value; + const INN = inn || this.partnerForm.get("inn")?.value; + const mention = contribution || this.partnerForm.get("contribution")?.value; + const profileLink = decisionMaker || this.partnerForm.get("decisionMaker")?.value; + + if ( + !partnerName || + !INN || + !mention || + !profileLink || + partnerName.trim().length === 0 || + mention.trim().length === 0 || + INN.trim().length === 0 || + profileLink.trim().length === 0 + ) { + return; + } + + const partnerItem = this.fb.group({ + id: [null], + name: [partnerName.trim(), Validators.required], + inn: [INN.trim(), Validators.required], + contribution: [mention, Validators.required], + decisionMaker: [profileLink, Validators.required], + }); + + this.partnerItems.update(items => [...items, partnerItem.value]); + partnerFormArray.push(partnerItem); + } + + /** + * Удаляет партнера по указанному индексу. + * @param index индекс удаляемого партнера + */ + public removePartner(index: number, partnersId: number, projectId: number): void { + const partnerFormArray = this.partners; + + this.partnerItems.update(items => items.filter((_, i) => i !== index)); + partnerFormArray.removeAt(index); + + this.projectService + .deletePartner(projectId, partnersId) + .pipe(takeUntil(this.destroy$)) + .subscribe(); + } + + /** + * Сбрасывает все ошибки валидации во всех контролах FormArray партнера. + */ + public clearAllPartnerErrors(): void { + const partners = this.partners; + + partners.controls.forEach(control => { + if (control instanceof FormGroup) { + Object.keys(control.controls).forEach(key => { + control.get(key)?.setErrors(null); + }); + } + }); + } + + /** + * Получает данные всех партнеров для отправки на сервер + * @returns массив объектов партнеров + */ + public getPartnersData(): any[] { + return this.partners.value.map((partner: any) => ({ + id: partner.id ?? null, + name: partner.name, + inn: partner.inn, + contribution: partner.contribution, + decisionMaker: partner.decisionMaker, + })); + } + + /** + * Сохраняет только новых партнеров (у которых id === null) — отправляет POST. + * После ответов присваивает полученные id в соответствующие FormGroup. + * Возвращает Observable массива результатов (в порядке отправки). + */ + public savePartners(projectId: number) { + const partners = this.getPartnersData(); + + if (partners.length === 0) { + return of([]); + } + + const requests = partners.map(partner => { + const decisionMaker = Number(partner.decisionMaker.split("/").at(-1)); + + const payload: PartnerDto = { + name: partner.name, + inn: partner.inn, + contribution: partner.contribution, + decisionMaker, + }; + + return this.projectService.addPartner(projectId, payload).pipe( + map((res: any) => ({ res, idx: partner.id })), + catchError(err => of({ __error: true, err, original: partner })) + ); + }); + + return forkJoin(requests).pipe( + tap(results => { + results.forEach((r: any) => { + if (r && r.__error) { + console.error("Failed to post partner", r.err, "original:", r.original); + return; + } + + const created = r.res; + const idx = r.idx; + + if (created && created.id !== undefined && created.id !== null) { + const formGroup = this.partners.at(idx); + if (formGroup) { + formGroup.get("id")?.setValue(created.id); + } + } else { + console.warn("addPartner response has no id field:", r.res); + } + }); + + this.syncPartnerItems(this.partners); + }) + ); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-resources.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-resources.service.ts new file mode 100644 index 00000000..e54a3c3a --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-resources.service.ts @@ -0,0 +1,291 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; +import { ProjectService } from "projects/social_platform/src/app/api/project/project.service"; +import { catchError, forkJoin, map, of, Subject, takeUntil, tap } from "rxjs"; +import { Resource, ResourceDto } from "../../../../domain/project/resource.model"; + +@Injectable({ + providedIn: "root", +}) +export class ProjectResourceService { + private readonly fb = inject(FormBuilder); + private readonly projectService = inject(ProjectService); + private resourceForm!: FormGroup; + public readonly resourceItems = signal< + Partial<{ id: null; type: string; description: string; partnerCompany: string }>[] + >([]); + + private readonly destroy$ = new Subject(); + + /** Флаг инициализации сервиса */ + private initialized = false; + + constructor() { + this.initializeResourceForm(); + } + + private initializeResourceForm(): void { + this.resourceForm = this.fb.group({ + resources: this.fb.array([]), + type: [null], + description: [null, Validators.maxLength(200)], + partnerCompany: [null], + }); + } + + /** + * Инициализирует сигнал resourceItems из данных FormArray + * Вызывается при первом обращении к данным + */ + public initializePartnerItems(resourceFormArray: FormArray): void { + if (this.initialized) return; + + if (resourceFormArray && this.resourceItems().length > 0) { + this.resourceItems.set(resourceFormArray.value); + } + + this.initialized = true; + } + + /** + * Принудительно синхронизирует сигнал с FormArray + * Полезно вызывать после загрузки данных с сервера + */ + public syncResourceItems(resourceFormArray: FormArray): void { + if (resourceFormArray) { + this.resourceItems.set(resourceFormArray.value); + } + } + + /** + * Инициализирует ресурсы из данных проекта + * Заполняет FormArray целей данными из проекта + */ + public initializeResourcesFromProject(resources: Resource[]): void { + const resourcesFormArray = this.resources; + + while (resourcesFormArray.length !== 0) { + resourcesFormArray.removeAt(0); + } + + if (resources && Array.isArray(resources)) { + resources.forEach(resource => { + const partnerGroup = this.fb.group({ + id: [resource.id ?? null], + type: [resource.type, Validators.required], + description: [resource.description, Validators.required], + partnerCompany: [resource.partnerCompany, Validators.required], + }); + resourcesFormArray.push(partnerGroup); + }); + + this.syncResourceItems(resourcesFormArray); + } else { + this.resourceItems.set([]); + } + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + readonly hasResources = computed(() => this.resourceItems().length > 0); + + /** + * Возвращает форму партнеров и ресурсов. + * @returns FormGroup экземпляр формы целей + */ + public getForm(): FormGroup { + return this.resourceForm; + } + + /** + * Получает FormArray партнеров и ресурсов + */ + public get resources(): FormArray { + return this.resourceForm.get("resources") as FormArray; + } + + public get resoruceType(): FormControl { + return this.resourceForm.get("type") as FormControl; + } + + public get resoruceDescription(): FormControl { + return this.resourceForm.get("description") as FormControl; + } + + public get resourcePartner(): FormControl { + return this.resourceForm.get("partnerCompany") as FormControl; + } + + /** + * Добавляет нового ресурса или сохраняет изменения существующей. + * @param type - тип ресурса (опционально) + * @param description - описание ресурса (опционально) + * @param partnerCompany - ссылка на партнера (опционально) + */ + public addResource(type?: string, description?: string, partnerCompany?: string): void { + const resourcesFormArray = this.resources; + + this.initializePartnerItems(resourcesFormArray); + + const resourceType = type || this.resourceForm.get("type")?.value; + const resourceDescription = description || this.resourceForm.get("description")?.value; + const partner = partnerCompany || this.resourceForm.get("partnerCompany")?.value; + + if ( + !resourceType || + !resourceDescription || + !partner || + resourceType.trim().length === 0 || + resourceDescription.trim().length === 0 || + partner.trim().length === 0 + ) { + return; + } + + const resourceItem = this.fb.group({ + id: [null], + type: [resourceType.trim(), Validators.required], + description: [resourceDescription.trim(), Validators.required], + partnerCompany: [partner, Validators.required], + }); + + this.resourceItems.update(items => [...items, resourceItem.value]); + resourcesFormArray.push(resourceItem); + } + + /** + * Удаляет ресурс по указанному индексу. + * @param index индекс удаляемого партнера + */ + public removeResource(index: number, resourceId: number, projectId: number): void { + const resourceFormArray = this.resources; + + this.resourceItems.update(items => items.filter((_, i) => i !== index)); + resourceFormArray.removeAt(index); + + this.projectService + .deleteResource(projectId, resourceId) + .pipe(takeUntil(this.destroy$)) + .subscribe(); + } + + /** + * Сбрасывает все ошибки валидации во всех контролах FormArray ресурса. + */ + public clearAllResourceErrors(): void { + const resources = this.resources; + + resources.controls.forEach(control => { + if (control instanceof FormGroup) { + Object.keys(control.controls).forEach(key => { + control.get(key)?.setErrors(null); + }); + } + }); + } + + /** + * Получает данные все ресурсы для отправки на сервер + * @returns массив объектов ресурсов + */ + public getResourcesData(): any[] { + return this.resources.value.map((resource: Resource) => ({ + id: resource.id ?? null, + type: resource.type, + description: resource.description, + partnerCompany: resource.partnerCompany, + })); + } + + /** + * Сохраняет только новых ресурсов (у которых id === null) — отправляет POST. + * После ответов присваивает полученные id в соответствующие FormGroup. + * Возвращает Observable массива результатов (в порядке отправки). + */ + public saveResources(projectId: number) { + const resources = this.getResourcesData(); + + const requests = resources.map(resource => { + const payload: Omit = { + type: resource.type, + description: resource.description, + partnerCompany: resource.partnerCompany ?? "запрос к рынку", + }; + + return this.projectService.addResource(projectId, payload).pipe( + map((res: any) => ({ res, idx: resource.idx })), + catchError(err => of({ __error: true, err, original: resource })) + ); + }); + + return forkJoin(requests).pipe( + tap(results => { + results.forEach((r: any) => { + if (r && r.__error) { + console.error("Failed to post resource", r.err, "original:", r.original); + return; + } + + const created = r.res; + const idx = r.idx; + + if (created && created.id !== undefined && created.id !== null) { + const formGroup = this.resources.at(idx); + if (formGroup) { + formGroup.get("id")?.setValue(created.id); + } + } + }); + + this.syncResourceItems(this.resources); + }) + ); + } + + public editResources(projectId: number) { + const resources = this.getResourcesData(); + + const requests = resources.map(resource => { + const payload: Omit = { + type: resource.type, + description: resource.description, + partnerCompany: resource.partnerCompany ?? "запрос к рынку", + }; + + return this.projectService.editResource(projectId, resource.id, payload).pipe( + map((res: any) => ({ res })), + catchError(err => of({ __error: true, err, original: resource })) + ); + }); + + return forkJoin(requests).pipe( + tap(results => { + results.forEach((r: any) => { + if (r && r.__error) { + console.error("Failed to add resource", r.err, "original:", r.original); + return; + } + + const created = r.res; + const idx = r.idx; + + if (created && created.id !== undefined && created.id !== null) { + const formGroup = this.resources.at(idx); + if (formGroup) { + formGroup.get("id")?.setValue(created.id); + } + } else { + console.warn("addResource response has no id field:", r.res); + } + }); + + this.syncResourceItems(this.resources); + }) + ); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-team.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-team.service.ts new file mode 100644 index 00000000..8d956ba5 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-team.service.ts @@ -0,0 +1,106 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { ValidationService } from "@corelib"; +import { InviteService } from "projects/social_platform/src/app/api/invite/invite.service"; +import { Subject, takeUntil } from "rxjs"; +import { ProjectTeamUIService } from "./ui/project-team-ui.service"; + +/** + * Сервис для управления приглашениями участников команды проекта. + * Предоставляет функциональность для создания и валидации формы приглашения, + * отправки, редактирования и удаления приглашений, управления состоянием модального окна и ошибок. + */ +@Injectable() +export class ProjectTeamService { + private readonly inviteService = inject(InviteService); + private readonly projectTeamUIService = inject(ProjectTeamUIService); + private readonly validationService = inject(ValidationService); + + private readonly destroy$ = new Subject(); + + private readonly inviteForm = this.projectTeamUIService.inviteForm; + private readonly inviteSubmitInitiated = this.projectTeamUIService.inviteSubmitInitiated; + private readonly inviteFormIsSubmitting = this.projectTeamUIService.inviteFormIsSubmitting; + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Отправляет приглашение пользователю по ссылке. + * @returns результат отправки + */ + public submitInvite(projectId: number): void { + this.inviteSubmitInitiated.set(true); + // Проверка валидности формы + if (!this.validationService.getFormValidation(this.inviteForm)) { + return; + } + + this.inviteFormIsSubmitting.set(true); + + // Извлечение profileId из URL ссылки + const linkUrl = new URL(this.inviteForm.get("link")?.value ?? ""); + const pathSegments = linkUrl.pathname.split("/"); + const profileId = Number(pathSegments[pathSegments.length - 1]); + + this.inviteService + .sendForUser( + profileId, + projectId, + this.inviteForm.get("role")?.value ?? "", + this.inviteForm.get("specialization")?.value ?? "" + ) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: invite => { + this.projectTeamUIService.applySubmitInvite(invite); + }, + error: err => { + this.projectTeamUIService.applyErrorSubmitInvite(err); + }, + }); + } + + /** + * Обновляет параметры существующего приглашения. + * @param params объект с inviteId, role и specialization + */ + public editInvitation(params: { inviteId: number; role: string; specialization: string }): void { + const { inviteId, role, specialization } = params; + this.inviteService + .updateInvite(inviteId, role, specialization) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => {}); + } + + /** + * Удаляет приглашение по идентификатору. + * @param invitationId идентификатор приглашения + */ + public removeInvitation(invitationId: number): void { + this.inviteService + .revokeInvite(invitationId) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => {}); + } + + /** + * Настроивает динамическую валидацию для поля link: + * сбрасывает валидаторы при пустом значении и очищает ошибку. + */ + public setupDynamicValidation(): void { + this.inviteForm + .get("link") + ?.valueChanges.pipe(takeUntil(this.destroy$)) + .subscribe(value => { + if (value === "") { + this.inviteForm.get("link")?.clearValidators(); + this.inviteForm.get("link")?.updateValueAndValidity(); + } + this.projectTeamUIService.applyClearLinkError(); + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/project-vacancy.service.ts b/projects/social_platform/src/app/api/project/facades/edit/project-vacancy.service.ts new file mode 100644 index 00000000..d36f7a33 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/project-vacancy.service.ts @@ -0,0 +1,119 @@ +/** @format */ + +import { inject, Injectable } from "@angular/core"; +import { Validators } from "@angular/forms"; +import { ValidationService } from "@corelib"; +import { Skill } from "../../../../domain/skills/skill"; +import { VacancyService } from "../../../vacancy/vacancy.service"; +import { Subject, takeUntil } from "rxjs"; +import { ProjectVacancyUIService } from "./ui/project-vacancy-ui.service"; +import { CreateVacancyDto } from "../../dto/create-vacancy.model"; + +/** + * Сервис для управления вакансиями проекта. + * Обеспечивает создание, валидацию, отправку, + * редактирование и удаление вакансий, а также работу с формой вакансии + * и синхронизацию с API. + */ +@Injectable() +export class ProjectVacancyService { + private readonly vacancyService = inject(VacancyService); + private readonly projectVacancyUIService = inject(ProjectVacancyUIService); + private readonly validationService = inject(ValidationService); + + private readonly destroy$ = new Subject(); + + private readonly vacancyForm = this.projectVacancyUIService.vacancyForm; + private readonly selectedSkills = this.projectVacancyUIService.selectedSkills; + + private readonly vacancyIsSubmitting = this.projectVacancyUIService.vacancyIsSubmitting; + private readonly vacancySubmitInitiated = this.projectVacancyUIService.vacancySubmitInitiated; + + constructor() { + this.vacancyForm + .get("skills") + ?.valueChanges.pipe(takeUntil(this.destroy$)) + .subscribe(skills => { + this.selectedSkills.set(skills ?? []); + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Отправляет форму вакансии: настраивает валидаторы, проверяет форму, + * создаёт вакансию через API и сбрасывает форму. + * @returns Promise - true при успехе, false при ошибке валидации или API + */ + public submitVacancy(projectId: number) { + // Настройка валидаторов для обязательных полей + this.vacancyForm.get("role")?.setValidators([Validators.required]); + this.vacancyForm.get("skills")?.setValidators([Validators.required]); + this.vacancyForm.get("requiredExperience")?.setValidators([Validators.required]); + this.vacancyForm.get("workFormat")?.setValidators([Validators.required]); + this.vacancyForm.get("workSchedule")?.setValidators([Validators.required]); + this.vacancyForm + .get("salary") + ?.setValidators([Validators.pattern("^(\\d{1,3}( \\d{3})*|\\d+)$")]); + + // Обновление валидности и отображение ошибок + Object.keys(this.vacancyForm.controls).forEach(name => { + const ctrl = this.vacancyForm.get(name); + ctrl?.updateValueAndValidity(); + if (["role", "skills"].includes(name)) ctrl?.markAsTouched(); + }); + + this.vacancySubmitInitiated.set(true); + + // Проверка валидации формы + if (!this.validationService.getFormValidation(this.vacancyForm)) { + return; + } + + // Подготовка payload для API + this.vacancyIsSubmitting.set(true); + + const form = this.vacancyForm.value; + + const payload: CreateVacancyDto = { + role: form.role!, + requiredSkillsIds: (form.skills ?? []).map(s => s.id), + description: form.description ?? "", + requiredExperience: form.requiredExperience!, + workFormat: form.workFormat!, + workSchedule: form.workSchedule!, + specialization: form.specialization ?? undefined, + salary: typeof form.salary === "string" ? +form.salary : null, + }; + + // Вызов API для создания вакансии + this.vacancyService + .postVacancy(projectId, payload) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: vacancy => { + this.projectVacancyUIService.applySubmitVacancy(vacancy); + }, + error: () => { + this.vacancyIsSubmitting.set(false); + }, + }); + } + + /** + * Удаляет вакансию по её идентификатору с подтверждением пользователя. + * @param vacancyId идентификатор вакансии для удаления + */ + public removeVacancy(vacancyId: number): void { + if (!confirm("Вы точно хотите удалить вакансию?")) return; + this.vacancyService + .deleteVacancy(vacancyId) + .pipe(takeUntil(this.destroy$)) + .subscribe(() => { + this.projectVacancyUIService.applyRemoveVacancy(vacancyId); + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/projects-edit-info.service.ts b/projects/social_platform/src/app/api/project/facades/edit/projects-edit-info.service.ts new file mode 100644 index 00000000..40d6c82c --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/projects-edit-info.service.ts @@ -0,0 +1,525 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { NavService } from "@ui/services/nav/nav.service"; +import { ProjectAssign } from "projects/social_platform/src/app/domain/project/project-assign.model"; +import { + distinctUntilChanged, + forkJoin, + map, + Observable, + of, + Subject, + switchMap, + takeUntil, + tap, +} from "rxjs"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; +import { ActivatedRoute, Router } from "@angular/router"; +import { Goal } from "projects/social_platform/src/app/domain/project/goals.model"; +import { Partner } from "projects/social_platform/src/app/domain/project/partner.model"; +import { Resource } from "projects/social_platform/src/app/domain/project/resource.model"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; +import { HttpErrorResponse } from "@angular/common/http"; +import { ValidationService } from "@corelib"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; +import { EditStep, ProjectStepService } from "../../project-step.service"; +import { ProjectService } from "../../project.service"; +import { IndustryService } from "../../../industry/industry.service"; +import { SkillsService } from "../../../skills/skills.service"; +import { ProjectFormService } from "./project-form.service"; +import { ProjectGoalService } from "./project-goals.service"; +import { ProjectVacancyService } from "./project-vacancy.service"; +import { ProjectPartnerService } from "./project-partner.service"; +import { ProjectResourceService } from "./project-resources.service"; +import { ProjectAchievementsService } from "./project-achievements.service"; +import { ProjectAdditionalService } from "./project-additional.service"; +import { SkillsInfoService } from "../../../skills/facades/skills-info.service"; +import { ProjectsEditUIInfoService } from "./ui/projects-edit-ui-info.service"; +import { ProjectVacancyUIService } from "./ui/project-vacancy-ui.service"; +import { ProjectTeamUIService } from "./ui/project-team-ui.service"; + +@Injectable() +export class ProjectsEditInfoService { + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly skillsInfoService = inject(SkillsInfoService); + + private readonly projectStepService = inject(ProjectStepService); + private readonly projectService = inject(ProjectService); + + private readonly projectTeamUIService = inject(ProjectTeamUIService); + private readonly projectVacancyUIService = inject(ProjectVacancyUIService); + private readonly projectsEditUIInfoService = inject(ProjectsEditUIInfoService); + + private readonly industryService = inject(IndustryService); + private readonly skillsService = inject(SkillsService); + private readonly navService = inject(NavService); + private readonly validationService = inject(ValidationService); + private readonly snackBarService = inject(SnackbarService); + + private readonly projectFormService = inject(ProjectFormService); + + private readonly projectVacancyService = inject(ProjectVacancyService); + private readonly projectGoalsService = inject(ProjectGoalService); + + private readonly projectPartnerService = inject(ProjectPartnerService); + private readonly projectResourceService = inject(ProjectResourceService); + + private readonly projectAchievementsService = inject(ProjectAchievementsService); + private readonly projectAdditionalService = inject(ProjectAdditionalService); + + private readonly destroy$ = new Subject(); + + // Текущий шаг редактирования + readonly editingStep = this.projectStepService.currentStep; + + // Получаем сигналы из сервиса + readonly achievements = this.projectFormService.achievements; + + // Id связи проекта и программы + readonly relationId = computed(() => this.projectFormService.relationId); + private readonly leaderId = this.projectsEditUIInfoService.leaderId; + + private readonly isCompetitive = this.projectsEditUIInfoService.isCompetitive; + private readonly isProjectAssignToProgram = + this.projectsEditUIInfoService.isProjectAssignToProgram; + + private readonly fromProgram = this.projectsEditUIInfoService.fromProgram; + + // Получаем форму проекта из сервиса + readonly projectForm = this.projectFormService.getForm(); + + // Получаем форму дополнительных полей из сервиса + readonly additionalForm = this.projectAdditionalService.getAdditionalForm(); + + // Геттеры для работы с целями + readonly goals = computed(() => this.projectGoalsService.goals); + + readonly partners = computed(() => this.projectPartnerService.partners); + + readonly resources = computed(() => this.projectResourceService.resources); + + // Observables для данных + readonly industries$ = this.industryService.industries.pipe( + map(industries => + industries.map(industry => ({ value: industry.id, id: industry.id, label: industry.name })) + ), + takeUntil(this.destroy$) + ); + + readonly profileId = signal(+this.route.snapshot.params["projectId"]); + + // Сигналы для управления состоянием + readonly inlineSkills = this.skillsInfoService.inlineSkills; + readonly nestedSkills$ = this.skillsService.getSkillsNested(); + + // Состояние отправки форм + readonly projSubmitInitiated = signal(false); + readonly submitMode = signal<"draft" | "published" | null>(null); + readonly projFormIsSubmittingAsPublished = signal(false); + readonly projFormIsSubmittingAsDraft = signal(false); + readonly openGroupIds = signal>(new Set()); + + initializationEditInfo(): void { + this.navService.setNavTitle("Создание проекта"); + + // Получение текущего шага редактирования из query параметров + this.setupEditingStep(); + + // Получение Id лидера проекта + this.setupLeaderIdSubscription(); + } + + initializationLoadingProjectData(): void { + this.loadProgramTagsAndProject(); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + // Методы для управления состоянием ошибок через сервис + setAssignProjectToProgramError(error: { non_field_errors: string[] }): void { + this.projectAdditionalService.setAssignProjectToProgramError(error); + } + + /** + * Привязка проекта к программе выбранной + * Перенаправление её на редактирование "нового" проекта + */ + assignProjectToProgram(): void { + this.projectService + .assignProjectToProgram( + Number(this.route.snapshot.paramMap.get("projectId")), + this.projectForm.get("partnerProgramId")?.value + ) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: r => { + this.projectsEditUIInfoService.applyOpenAssignProjectModal(r); + this.router.navigateByUrl(`/office/projects/${r.newProjectId}/edit?editingStep=main`); + }, + + error: err => { + if (err instanceof HttpErrorResponse) { + if (err.status === 400) { + this.setAssignProjectToProgramError(err.error); + } + } + }, + }); + } + + // Методы для управления состоянием отправки форм + setIsSubmittingAsPublished(status: boolean): void { + this.projFormIsSubmittingAsPublished.set(status); + } + + setIsSubmittingAsDraft(status: boolean): void { + this.projFormIsSubmittingAsDraft.set(status); + } + + onGroupToggled(isOpen: boolean, skillsGroupId: number): void { + this.openGroupIds.update(set => { + const next = new Set(set); + next.clear(); + if (isOpen) next.add(skillsGroupId); + return next; + }); + } + + /** + * Удаление проекта с проверкой удаления у пользователя + */ + deleteProject(): void { + this.projectService + .remove(Number(this.route.snapshot.paramMap.get("projectId"))) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => { + this.router.navigateByUrl(`/office/projects/my`); + }, + }); + } + + /** + * Сохранение проекта как опубликованного с проверкой доп. полей + */ + saveProjectAsPublished(): void { + this.projectForm.get("draft")?.patchValue(false); + this.submitMode.set("published"); + + if (!this.isCompetitive()) { + this.projFormIsSubmittingAsPublished.set(true); + this.submitProjectForm(); + return; + } + + this.projectForm.markAllAsTouched(); + this.projectFormService.achievements.markAllAsTouched(); + + const projectValid = this.validationService.getFormValidation(this.projectForm); + const additionalValid = this.validationService.getFormValidation(this.additionalForm); + + if (!projectValid || !additionalValid) { + this.projSubmitInitiated.set(true); + return; + } + + if (this.validateAdditionalFields()) { + this.projSubmitInitiated.set(true); + return; + } + + this.projectsEditUIInfoService.applySendDescision(); + } + + /** + * Сохранение проекта как черновика + */ + saveProjectAsDraft(): void { + this.clearAllValidationErrors(); + this.projectForm.get("draft")?.patchValue(true); + this.submitMode.set("draft"); + const partnerProgramId = this.projectForm.get("partnerProgramId")?.value; + this.projectForm.patchValue({ partnerProgramId }); + this.projFormIsSubmittingAsDraft.set(true); + + if (this.isCompetitive()) { + const projectId = Number(this.route.snapshot.params["projectId"]); + const relationId = this.relationId(); + this.sendAdditionalFields(projectId, relationId()); + } else { + this.submitProjectForm(); + } + } + + /** + * Отправка формы проекта + */ + submitProjectForm(): void { + const isDraft = this.projectForm.get("draft")?.value === true; + + this.projectFormService.achievements.controls.forEach(achievementForm => { + achievementForm.markAllAsTouched(); + }); + + const payload = this.projectFormService.getFormValue(); + const projectId = Number(this.route.snapshot.paramMap.get("projectId")); + + if (this.projectVacancyUIService.isDirty()) { + this.projectVacancyService.submitVacancy(projectId); + } + + if (isDraft) { + if ( + !this.validationService.getFormValidation(this.projectForm) || + this.projectVacancyUIService.applyValidateForm() + ) { + return; + } + } else { + if ( + !this.validationService.getFormValidation(this.projectForm) || + !this.validationService.getFormValidation(this.additionalForm) || + this.projectVacancyUIService.applyValidateForm() + ) { + return; + } + } + + this.submitMode.set(null); + this.projectService + .updateProject(projectId, payload) + .pipe( + switchMap(() => this.saveOrEditGoals(projectId)), + switchMap(() => this.savePartners(projectId)), + switchMap(() => this.saveOrEditResources(projectId)) + ) + .subscribe({ + next: () => { + this.completeSubmitedProjectForm(projectId); + }, + error: () => { + this.submitMode.set(null); + this.projFormIsSubmittingAsPublished.set(false); + this.projFormIsSubmittingAsDraft.set(false); + this.snackBarService.error("ошибка при сохранении данных"); + }, + }); + } + + closeSendingDescisionModal(): void { + this.projectsEditUIInfoService.applyCloseSendDescisionModal(); + + const projectId = Number(this.route.snapshot.params["projectId"]); + const relationId = this.relationId(); + + this.projFormIsSubmittingAsPublished.set(true); + this.sendAdditionalFields(projectId, relationId()); + } + + loadProgramTagsAndProject(): void { + // Сброс состояния перед загрузкой + this.isCompetitive.set(false); + this.isProjectAssignToProgram.set(false); + + this.route.data + .pipe( + map(d => d["data"]), + takeUntil(this.destroy$) + ) + .subscribe( + ([project, goals, partners, resources, invites]: [ + Project, + Goal[], + Partner[], + Resource[], + Invite[] + ]) => { + // Используем сервис для инициализации данных проекта + this.projectFormService.initializeProjectData(project); + this.projectGoalsService.initializeGoalsFromProject(goals); + this.projectPartnerService.initializePartnerFromProject(partners); + this.projectResourceService.initializeResourcesFromProject(resources); + this.projectTeamUIService.applySetInvites(invites); + this.projectTeamUIService.applySetCollaborators(project.collaborators); + + if (project.partnerProgram) { + this.isCompetitive.set( + !!project.partnerProgram.programId && project.partnerProgram.canSubmit + ); + this.isProjectAssignToProgram.set(!!project.partnerProgram.programId); + + this.projectAdditionalService.initializeAdditionalForm( + project.partnerProgram?.programFields, + project.partnerProgram?.programFieldValues + ); + } + + this.projectVacancyUIService.applySetVacancies(project.vacancies); + this.projectTeamUIService.applySetInvites(invites); + } + ); + } + + /** + * Поиск навыков + * @param query - поисковый запрос + */ + onSearchSkill(query: string): void { + this.skillsInfoService.onSearchSkill(query); + } + + private setupEditingStep(): void { + const stepFromUrl = this.route.snapshot.queryParams["editingStep"] as EditStep; + if (stepFromUrl) { + this.projectStepService.setStepFromRoute(stepFromUrl); + } + + this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe(params => { + const step = params["editingStep"] as EditStep; + this.fromProgram.set(params["fromProgram"]); + if (step && step !== this.editingStep()) { + this.projectStepService.setStepFromRoute(step); + } + }); + } + + private setupLeaderIdSubscription(): void { + this.route.data + .pipe( + distinctUntilChanged(), + map(d => d["data"]), + takeUntil(this.destroy$) + ) + .subscribe(([project]: [Project]) => { + this.leaderId.set(project.leader); + }); + } + + /** + * Валидация дополнительных полей для публикации + * Делегирует валидацию сервису + * @returns true если есть ошибки валидации + */ + private validateAdditionalFields(): boolean { + const partnerProgramFields = this.projectAdditionalService.partnerProgramFields(); + + // Если нет дополнительных полей - пропускаем валидацию + if (!partnerProgramFields?.length) { + return false; + } + + // Проверяем только обязательные поля + const hasInvalid = this.projectAdditionalService.validateRequiredFields(); + + if (hasInvalid) { + return true; + } + + // Подготавливаем поля для отправки (убираем валидаторы с заполненных полей) + this.projectAdditionalService.prepareFieldsForSubmit(); + return false; + } + + /** + * Очистка всех ошибок валидации + */ + private clearAllValidationErrors(): void { + // Очистка основной формы + this.projectFormService.clearAllValidationErrors(); + this.projectAchievementsService.clearAllAchievementsErrors(this.achievements); + + // Очистка ошибок целей теперь входит в clearAllValidationErrors() ProjectFormService + } + + private saveOrEditGoals(projectId: number) { + const goals = this.goals().value as Goal[]; + + const newGoals = goals.filter(g => !g.id); + const existingGoals = goals.filter(g => g.id); + + const requests: Observable[] = []; + + if (newGoals.length > 0) { + requests.push(this.projectGoalsService.saveGoals(projectId, newGoals)); + } + + if (existingGoals.length > 0) { + requests.push(this.projectGoalsService.editGoals(projectId, existingGoals)); + } + + if (requests.length === 0) { + return of(null); + } + + return forkJoin(requests).pipe( + tap(() => { + this.projectGoalsService.syncGoalItems(this.projectGoalsService.goals); + }) + ); + } + + private savePartners(projectId: number) { + const partners = this.partners().value; + + if (!partners.length) { + return of([]); + } + + return this.projectPartnerService.savePartners(projectId); + } + + private saveOrEditResources(projectId: number) { + const resources = this.resources().value; + const hasExistingResources = resources.some((r: Resource) => r.id != null); + + if (!resources.length) { + return of([]); + } + + return hasExistingResources + ? this.projectResourceService.editResources(projectId) + : this.projectResourceService.saveResources(projectId); + } + + private completeSubmitedProjectForm(projectId: number) { + this.snackBarService.success("данные успешно сохранены"); + this.submitMode.set(null); + this.projFormIsSubmittingAsPublished.set(false); + this.projFormIsSubmittingAsDraft.set(false); + this.router.navigateByUrl(`/office/projects/${projectId}`); + } + + /** + * Отправка дополнительных полей через сервис + * @param projectId - ID проекта + * @param relationId - ID связи проекта и конкурсной программы + */ + private sendAdditionalFields(projectId: number, relationId: number): void { + const isDraft = this.projectForm.get("draft")?.value === true; + + this.projectAdditionalService + .sendAdditionalFieldsValues(projectId) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: () => { + if (!isDraft) { + this.projectAdditionalService.submitCompettetiveProject(relationId).subscribe(_ => { + this.submitProjectForm(); + }); + } else { + this.submitProjectForm(); + } + }, + error: error => { + console.error("Error sending additional fields:", error); + this.submitMode.set("draft"); + }, + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/ui/project-goals-ui.service.ts b/projects/social_platform/src/app/api/project/facades/edit/ui/project-goals-ui.service.ts new file mode 100644 index 00000000..8237d5df --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/ui/project-goals-ui.service.ts @@ -0,0 +1,75 @@ +/** @format */ + +import { computed, Injectable, signal } from "@angular/core"; +import { FormArray } from "@angular/forms"; + +@Injectable({ providedIn: "root" }) +export class ProjectGoalsUIService { + readonly goalLeaderShowModal = signal(false); + readonly activeGoalIndex = signal(null); + readonly selectedLeaderId = signal(""); + + readonly goalItems = signal([]); + + readonly hasGoals = computed(() => this.goalItems().length > 0); + + /** + * Обработчик изменения радио-кнопки для выбора лидера + * @param event - событие изменения + */ + applyOnLeaderRadioChange(event: Event): void { + const target = event.target as HTMLInputElement; + this.selectedLeaderId.set(target.value); + } + + /** + * Добавляет лидера на определенную цель + */ + applyAddLeaderToGoal(goals: FormArray): void { + const goalIndex = this.activeGoalIndex(); + const leaderId = this.selectedLeaderId(); + + if (goalIndex === null || !leaderId) { + return; + } + + const goalFormGroup = goals.at(goalIndex); + goalFormGroup?.get("responsible")?.setValue(leaderId); + + this.applyCloseGoalLeaderModal(); + } + + /** + * Открывает модальное окно выбора лидера для конкретной цели + * @param index - индекс цели + */ + applyOpenGoalLeaderModal(goals: FormArray, index: number): void { + this.activeGoalIndex.set(index); + + const currentLeader = goals.at(index)?.get("responsible")?.value; + this.selectedLeaderId.set(currentLeader || ""); + + this.goalLeaderShowModal.set(true); + } + + /** + * Закрывает модальное окно выбора лидера + */ + applyCloseGoalLeaderModal(): void { + this.goalLeaderShowModal.set(false); + this.activeGoalIndex.set(null); + this.selectedLeaderId.set(""); + } + + /** + * Переключает состояние модального окна выбора лидера + * @param index - индекс цели (опционально) + */ + applyToggleGoalLeaderModal(goals: FormArray, index?: number): void { + if (this.goalLeaderShowModal()) { + this.applyCloseGoalLeaderModal(); + } else if (index !== undefined) { + this.applyOpenGoalLeaderModal(goals, index); + } + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/ui/project-team-ui.service.ts b/projects/social_platform/src/app/api/project/facades/edit/ui/project-team-ui.service.ts new file mode 100644 index 00000000..5ab098ed --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/ui/project-team-ui.service.ts @@ -0,0 +1,148 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model"; + +@Injectable({ providedIn: "root" }) +export class ProjectTeamUIService { + private readonly fb = inject(FormBuilder); + + readonly invites = signal([]); + readonly collaborators = signal([]); + readonly isInviteModalOpen = signal(false); + readonly inviteNotExistingError = signal(null); + + // Состояние отправки формы + readonly inviteSubmitInitiated = signal(false); + readonly inviteFormIsSubmitting = signal(false); + + /** + * Создает форму приглашения с контролами role, link и specialization, устанавливая валидаторы. + */ + readonly inviteForm = this.fb.group({ + role: ["", [Validators.required]], + link: [ + "", + [ + Validators.required, + Validators.pattern(/^http(s)?:\/\/.+(:[0-9]*)?\/office\/profile\/\d+$/), + ], + ], + specialization: [null], + }); + + // Геттеры для контролов формы приглашения + get role() { + return this.inviteForm.get("role"); + } + + get link() { + return this.inviteForm.get("link"); + } + + get specialization() { + return this.inviteForm.get("specialization"); + } + + /** + * Сбрасывает ошибку отсутствия пользователя при изменении ссылки. + */ + applyClearLinkError(): void { + if (this.inviteNotExistingError()) { + this.inviteNotExistingError.set(null); + } + } + + /** + * Устанавливает список приглашений. + * @param invites массив Invite + */ + applySetInvites(invites: Invite[]): void { + this.invites.set(invites); + } + + /** + * Устанавливает список команды + * @param collaborators массив Collaborator + */ + applySetCollaborators(collaborators: Collaborator[]): void { + this.collaborators.set(collaborators); + } + + /** + * Открывает модальное окно для отправки приглашения. + */ + applyOpenInviteModal(): void { + this.isInviteModalOpen.set(true); + } + + /** + * Закрывает модальное окно для отправки приглашения. + */ + applyCloseInviteModal(): void { + this.isInviteModalOpen.set(false); + } + + applySubmitInvite(invite: Invite): void { + this.invites.update(list => [...list, invite]); + this.resetInviteForm(); + this.applyCloseInviteModal(); + } + + applyErrorSubmitInvite(err: any): void { + this.inviteNotExistingError.set(err); + this.inviteFormIsSubmitting.set(false); + } + + applyEditInvitation(params: { inviteId: number; role: string; specialization: string }): void { + const { inviteId, role, specialization } = params; + this.invites.update(list => + list.map(i => (i.id === inviteId ? { ...i, role, specialization } : i)) + ); + } + + applyRemoveInvitation(invitationId: number): void { + this.invites.update(list => list.filter(i => i.id !== invitationId)); + } + + /** + * Удаляет участника по идентификатору. + * @param collaboratorId идентификатор приглашения + */ + applyRemoveCollaborator(collaboratorId: number): void { + this.collaborators.update(list => list.filter(i => i.userId !== collaboratorId)); + } + + /** + * Проверяет валидность формы приглашения. + * @returns boolean true если форма валидна + */ + applyValidateInviteForm(): boolean { + return this.inviteForm.valid; + } + + /** + * Возвращает текущее значение формы приглашения. + * @returns any объект значений формы + */ + applyGetInviteFormValue(): any { + return this.inviteForm.value; + } + + /** + * Сбрасывает форму приглашения и очищает ошибки. + */ + resetInviteForm(): void { + this.inviteForm.reset(); + Object.keys(this.inviteForm.controls).forEach(name => { + const ctrl = this.inviteForm.get(name); + ctrl?.clearValidators(); + ctrl?.markAsPristine(); + ctrl?.updateValueAndValidity(); + }); + this.inviteNotExistingError.set(null); + this.inviteFormIsSubmitting.set(false); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/ui/project-vacancy-ui.service.ts b/projects/social_platform/src/app/api/project/facades/edit/ui/project-vacancy-ui.service.ts new file mode 100644 index 00000000..935caab9 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/ui/project-vacancy-ui.service.ts @@ -0,0 +1,197 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder } from "@angular/forms"; +import { rolesMembersList } from "projects/core/src/consts/lists/roles-members-list.const"; +import { workExperienceList } from "projects/core/src/consts/lists/work-experience-list.const"; +import { workFormatList } from "projects/core/src/consts/lists/work-format-list.const"; +import { workScheludeList } from "projects/core/src/consts/lists/work-schelude-list.const"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; +import { ProjectFormService } from "../project-form.service"; +import { ValidationService } from "@corelib"; +import { stripNullish } from "@utils/helpers/stripNull"; + +@Injectable({ providedIn: "root" }) +export class ProjectVacancyUIService { + private readonly fb = inject(FormBuilder); + private readonly projectFormService = inject(ProjectFormService); + private readonly validationService = inject(ValidationService); + + /** Константы для выпадающих списков */ + public readonly workExperienceList = workExperienceList; + public readonly workFormatList = workFormatList; + public readonly workScheludeList = workScheludeList; + public readonly rolesMembersList = rolesMembersList; + + /** Сигналы для выбранных значений селектов */ + public readonly selectedRequiredExperienceId = signal(undefined); + public readonly selectedWorkFormatId = signal(undefined); + public readonly selectedWorkScheduleId = signal(undefined); + public readonly selectedVacanciesSpecializationId = signal(undefined); + + readonly selectedSkills = signal([]); + readonly skillsGroupsModalOpen = signal(false); + + // Состояние отправки формы + readonly vacancySubmitInitiated = signal(false); + readonly vacancyIsSubmitting = signal(false); + + readonly vacancies = signal([]); + readonly onEditClicked = signal(false); + + readonly vacancyForm = this.fb.group({ + role: this.fb.control(null), + skills: this.fb.control([]), + description: this.fb.control(""), + requiredExperience: this.fb.control(null), + workFormat: this.fb.control(null), + salary: this.fb.control(""), + workSchedule: this.fb.control(null), + specialization: this.fb.control(null), + }); + + /** + * Устанавливает список вакансий. + * @param vacancies массив объектов Vacancy + */ + applySetVacancies(vacancies: Vacancy[]): void { + this.vacancies.set(vacancies); + } + + /** + * Проставляет значения в форму вакансии. + * @param values частичные поля Vacancy для патчинга + */ + applyPatchFormValues(values: Partial): void { + this.vacancyForm.patchValue(values); + } + + /** + * Проверяет валидность формы вакансии. + * @returns true если форма валидна + */ + applyValidateForm(): boolean { + return !this.validationService.getFormValidation(this.vacancyForm); + } + + /** + * Проверяет на "грязность" формы вакансии. + * @returns true если "грязная" форма + */ + isDirty(): boolean { + return this.vacancyForm.dirty; + } + + /** + * Возвращает очищенные от nullish значения формы. + * @returns объект значений формы без null и undefined + */ + getFormValue(): any { + return stripNullish(this.vacancyForm.value); + } + + // Геттеры для быстрого доступа к контролам формы + get role() { + return this.vacancyForm.get("role"); + } + + get skills() { + return this.vacancyForm.get("skills"); + } + + get description() { + return this.vacancyForm.get("description"); + } + + get requiredExperience() { + return this.vacancyForm.get("requiredExperience"); + } + + get workFormat() { + return this.vacancyForm.get("workFormat"); + } + + get salary() { + return this.vacancyForm.get("salary"); + } + + get workSchedule() { + return this.vacancyForm.get("workSchedule"); + } + + get specialization() { + return this.vacancyForm.get("specialization"); + } + + applyRemoveVacancy(vacancyId: number): void { + this.vacancies.update(list => list.filter(v => v.id !== vacancyId)); + } + + applySubmitVacancy(vacancy: Vacancy): void { + this.vacancies.update(list => [...list, vacancy]); + this.applyResetVacancyForm(); + } + + /** + * Инициализирует редактирование вакансии по индексу в массиве: + * заполняет форму, выставляет сигналы и переключает режим редактирования. + * @param index индекс вакансии в списке vacancies + */ + applyEditVacancy(index: number): void { + const item = this.vacancies()[index]; + // Установка выбранных значений селектов по сопоставлению + this.workExperienceList.find(e => e.value === item.requiredExperience) && + this.selectedRequiredExperienceId.set( + this.workExperienceList.find(e => e.value === item.requiredExperience)!.id + ); + + this.workFormatList.find(f => f.value === item.workFormat) && + this.selectedWorkFormatId.set(this.workFormatList.find(f => f.value === item.workFormat)!.id); + + this.workScheludeList.find(s => s.value === item.workSchedule) && + this.selectedWorkScheduleId.set( + this.workScheludeList.find(s => s.value === item.workSchedule)!.id + ); + + this.rolesMembersList.find(r => r.value === item.specialization) && + this.selectedVacanciesSpecializationId.set( + this.rolesMembersList.find(r => r.value === item.specialization)!.id + ); + + // Патчинг формы значениями вакансии + this.vacancyForm.patchValue({ + role: item.role, + skills: item.requiredSkills, + description: item.description, + requiredExperience: item.requiredExperience, + workFormat: item.workFormat, + salary: item.salary ?? null, + workSchedule: item.workSchedule, + specialization: item.specialization, + }); + this.projectFormService.editIndex.set(index); + this.onEditClicked.set(true); + } + + /** + * Сбрасывает форму вакансии к начальному состоянию: + * очищает значения, валидаторы и состояния контролов, + * сбрасывает сигналы выбранных селектов. + */ + applyResetVacancyForm(): void { + this.vacancyForm.reset(); + Object.keys(this.vacancyForm.controls).forEach(name => { + const ctrl = this.vacancyForm.get(name); + ctrl?.reset(name === "skills" ? [] : ""); + ctrl?.clearValidators(); + ctrl?.markAsPristine(); + ctrl?.updateValueAndValidity(); + }); + this.selectedRequiredExperienceId.set(undefined); + this.selectedWorkFormatId.set(undefined); + this.selectedWorkScheduleId.set(undefined); + this.selectedVacanciesSpecializationId.set(undefined); + this.vacancyIsSubmitting.set(false); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/edit/ui/projects-edit-ui-info.service.ts b/projects/social_platform/src/app/api/project/facades/edit/ui/projects-edit-ui-info.service.ts new file mode 100644 index 00000000..5cbd48a9 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/edit/ui/projects-edit-ui-info.service.ts @@ -0,0 +1,58 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; +import { ProjectAssign } from "projects/social_platform/src/app/domain/project/project-assign.model"; + +@Injectable() +export class ProjectsEditUIInfoService { + // Id Лидера проекта + readonly leaderId = signal(0); + readonly fromProgram = signal(""); + + // Маркер того является ли проект привязанный к конкурсной программе + readonly isCompetitive = signal(false); + readonly isProjectAssignToProgram = signal(false); + + // Состояние компонента + readonly isCompleted = signal(false); + readonly isSendDescisionToPartnerProgramProject = signal(false); + readonly isAssignProjectToProgramModalOpen = signal(false); + + // Маркер что проект привязан + readonly isProjectBoundToProgram = signal(false); + + // Сигналы для работы с модальными окнами с ошибкой + readonly errorModalMessage = signal<{ + program_name: string; + whenCanEdit: string; + daysUntilResolution: string; + } | null>(null); + + readonly onEditClicked = signal(false); + readonly warningModalSeen = signal(false); + + // Сигналы для работы с модальными окнами с текстом + readonly assignProjectToProgramModalMessage = signal(null); + + applyOpenAssignProjectModal(r: any): void { + this.assignProjectToProgramModalMessage.set(r); + this.isAssignProjectToProgramModalOpen.set(true); + } + + applySendDescision(): void { + this.isSendDescisionToPartnerProgramProject.set(true); + } + + applyCloseSendDescisionModal(): void { + this.isSendDescisionToPartnerProgramProject.set(false); + } + + // Методы для работы с модальными окнами + applyCloseWarningModal(): void { + this.warningModalSeen.set(true); + } + + closeAssignProjectToProgramModal(): void { + this.isAssignProjectToProgramModalOpen.set(false); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/list/projects-list-info.service.ts b/projects/social_platform/src/app/api/project/facades/list/projects-list-info.service.ts new file mode 100644 index 00000000..5ad7b7f6 --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/list/projects-list-info.service.ts @@ -0,0 +1,218 @@ +/** @format */ + +import { ElementRef, inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, Params } from "@angular/router"; +import { + concatMap, + distinctUntilChanged, + EMPTY, + fromEvent, + map, + of, + Subject, + takeUntil, + tap, + throttleTime, +} from "rxjs"; +import { NavService } from "@ui/services/nav/nav.service"; +import { ProjectService } from "../../project.service"; +import { ProjectsInfoService } from "../projects-info.service"; +import { ProgramDetailListInfoService } from "../../../program/facades/detail/program-detail-list-info.service"; +import { inviteToProjectMapper } from "@utils/helpers/inviteToProjectMapper"; +import { HttpParams } from "@angular/common/http"; +import { ApiPagination } from "projects/skills/src/models/api-pagination.model"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; + +@Injectable() +export class ProjectsListInfoService { + private readonly route = inject(ActivatedRoute); + private readonly navService = inject(NavService); + private readonly projectService = inject(ProjectService); + private readonly projectsInfoService = inject(ProjectsInfoService); + private readonly programDetailListInfoService = inject(ProgramDetailListInfoService); + + private readonly destroy$ = new Subject(); + + private readonly projectsCount = signal(0); + private readonly currentPage = signal(1); + private readonly projectsPerFetch = signal(15); + + private readonly currentSearchQuery = signal(undefined); + private previousReqQuery = signal>({}); + + readonly projects = signal([]); + + private readonly isAll = this.projectsInfoService.isAll; + private readonly isSubs = this.projectsInfoService.isSubs; + private readonly isDashboard = this.projectsInfoService.isDashboard; + private readonly isInvites = this.projectsInfoService.isInvites; + + initializationProjectsList(): void { + this.navService.setNavTitle("Проекты"); + + this.projectsInfoService.initializationRouterEvents(); + + if (this.isDashboard() || this.isSubs()) { + this.programDetailListInfoService.setupProfile(); + } + + this.route.queryParams + .pipe( + map(q => q["name__contains"]), + takeUntil(this.destroy$) + ) + .subscribe(search => { + if (search !== this.currentSearchQuery()) { + this.currentSearchQuery.set(search); + this.currentPage.set(1); + } + }); + + if (location.href.includes("/all")) { + const observable = this.route.queryParams.pipe( + distinctUntilChanged(), + concatMap(q => { + const reqQuery = this.buildFilterQuery(q); + + if (JSON.stringify(reqQuery) !== JSON.stringify(this.previousReqQuery())) { + try { + this.previousReqQuery.set(reqQuery); + return this.projectService.getAll(new HttpParams({ fromObject: reqQuery })); + } catch (e) { + console.error(e); + this.previousReqQuery.set(reqQuery); + return this.projectService.getAll(); + } + } + + this.previousReqQuery.set(reqQuery); + + return of(0); + }), + takeUntil(this.destroy$) + ); + + observable.pipe(takeUntil(this.destroy$)).subscribe(projects => { + if (typeof projects === "number") return; + + this.projects.set(projects.results); + }); + } + + this.route.data + .pipe( + map(r => r["data"]), + takeUntil(this.destroy$) + ) + .subscribe(projects => { + this.projectsCount.set(projects.count); + + if (this.isInvites()) { + this.projects.set(inviteToProjectMapper(projects ?? [])); + } else { + this.projects.set(projects.results ?? []); + } + }); + } + + initScroll(target: HTMLElement, listRoot: ElementRef): void { + fromEvent(target, "scroll") + .pipe( + throttleTime(300), + concatMap(() => this.onScroll(target, listRoot)), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + private buildFilterQuery(q: Params): Record { + const reqQuery: Record = {}; + + if (q["name__contains"]) { + reqQuery["name__contains"] = q["name__contains"]; + } + if (q["industry"]) { + reqQuery["industry"] = q["industry"]; + } + if (q["step"]) { + reqQuery["step"] = q["step"]; + } + if (q["membersCount"]) { + reqQuery["collaborator__count__gte"] = q["membersCount"]; + } + if (q["anyVacancies"]) { + reqQuery["any_vacancies"] = q["anyVacancies"]; + } + if (q["is_rated_by_expert"]) { + reqQuery["is_rated_by_expert"] = q["is_rated_by_expert"]; + } + if (q["is_mospolytech"]) { + reqQuery["is_mospolytech"] = q["is_mospolytech"]; + reqQuery["partner_program"] = q["partner_program"]; + } + + return reqQuery; + } + + private onScroll(target: HTMLElement, listRoot: ElementRef) { + if (this.isSubs() || this.isInvites()) { + return EMPTY; + } + + if (this.projectsCount() && this.projects().length >= this.projectsCount()) return EMPTY; + + if (!target || !listRoot.nativeElement) return EMPTY; + + const diff = + target.scrollTop - listRoot.nativeElement.getBoundingClientRect().height + window.innerHeight; + + if (diff > 0) { + return this.onFetch( + this.currentPage() * this.projectsPerFetch(), + this.projectsPerFetch() + ).pipe( + tap(chunk => { + this.currentPage.update(p => p + 1); + this.projects.update(() => [...this.projects(), ...chunk]); + }) + ); + } + + return EMPTY; + } + + private onFetch(skip: number, take: number) { + if (this.isAll()) { + const queries = this.route.snapshot.queryParams; + + const queryParams = { + offset: skip, + limit: take, + ...this.buildFilterQuery(queries), + }; + + return this.projectService.getAll(new HttpParams({ fromObject: queryParams })).pipe( + map((projects: ApiPagination) => { + return projects.results; + }) + ); + } else { + return this.projectService.getMy().pipe( + map((projects: ApiPagination) => { + this.projectsCount.set(projects.count); + return projects.results; + }) + ); + } + } + + sliceInvitesArray(inviteId: number): void { + this.projects.update(projects => projects.filter(p => p.inviteId !== inviteId)); + this.projectsCount.update(() => Math.max(0, this.projectsCount() - 1)); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/projects-info.service.ts b/projects/social_platform/src/app/api/project/facades/projects-info.service.ts new file mode 100644 index 00000000..dd81c8dc --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/projects-info.service.ts @@ -0,0 +1,91 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { ActivatedRoute, NavigationEnd, Router } from "@angular/router"; +import { NavService } from "@ui/services/nav/nav.service"; +import { debounceTime, distinctUntilChanged, filter, map, Subject, takeUntil } from "rxjs"; +import { ProjectService } from "../project.service"; +import { ProjectsUIInfoService } from "./ui/projects-ui-info.service"; + +@Injectable() +export class ProjectsInfoService { + private readonly navService = inject(NavService); + private readonly route = inject(ActivatedRoute); + private readonly projectService = inject(ProjectService); + private readonly projectsUIInfoService = inject(ProjectsUIInfoService); + private readonly router = inject(Router); + + private readonly destroy$ = new Subject(); + + private readonly url = signal(this.router.url); + private readonly searchForm = this.projectsUIInfoService.searchForm; + + readonly isMy = computed(() => this.url().includes("/my")); + readonly isAll = computed(() => this.url().includes("/all")); + readonly isSubs = computed(() => this.url().includes("/subscriptions")); + readonly isInvites = computed(() => this.url().includes("/invites")); + readonly isDashboard = computed(() => this.url().includes("/dashboard")); + + initializationProjects(): void { + this.navService.setNavTitle("Проекты"); + + this.route.data + .pipe(map(r => r["data"])) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: invites => { + this.projectsUIInfoService.applySetProjectsInvites(invites); + }, + }); + + this.searchForm + .get("search") + ?.valueChanges.pipe(debounceTime(300), distinctUntilChanged(), takeUntil(this.destroy$)) + .subscribe(search => { + this.router + .navigate([], { + queryParams: { name__contains: search }, + relativeTo: this.route, + queryParamsHandling: "merge", + }) + .then(() => console.debug("QueryParams changed from ProjectsComponent")); + }); + + this.initializationRouterEvents(); + } + + initializationRouterEvents(): void { + this.router.events + .pipe( + filter(event => event instanceof NavigationEnd), + takeUntil(this.destroy$) + ) + .subscribe(() => this.url.set(this.router.url)); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + addProject(): void { + const fromProgram = + this.route.snapshot.parent?.routeConfig?.path === "programs" ? { fromProgram: true } : null; + + this.projectService + .create() + .pipe(takeUntil(this.destroy$)) + .subscribe(project => { + this.projectService.projectsCount.next({ + ...this.projectService.projectsCount.getValue(), + my: this.projectService.projectsCount.getValue().my + 1, + }); + + this.router + .navigate([`/office/projects/${project.id}/edit`], { + queryParams: { editingStep: "main", fromProgram }, + }) + .then(() => console.debug("Route change from ProjectsComponent")); + }); + } +} diff --git a/projects/social_platform/src/app/api/project/facades/ui/projects-ui-info.service.ts b/projects/social_platform/src/app/api/project/facades/ui/projects-ui-info.service.ts new file mode 100644 index 00000000..d2b6a61e --- /dev/null +++ b/projects/social_platform/src/app/api/project/facades/ui/projects-ui-info.service.ts @@ -0,0 +1,28 @@ +/** @format */ + +import { computed, inject, Injectable, signal } from "@angular/core"; +import { FormBuilder } from "@angular/forms"; +import { inviteToProjectMapper } from "@utils/helpers/inviteToProjectMapper"; +import { Invite } from "projects/social_platform/src/app/domain/invite/invite.model"; +import { Project } from "projects/social_platform/src/app/domain/project/project.model"; + +@Injectable() +export class ProjectsUIInfoService { + private readonly fb = inject(FormBuilder); + + readonly myInvites = computed(() => this.allInvites().slice(0, 1)); + + readonly allInvites = signal([]); + + readonly searchForm = this.fb.group({ + search: [""], + }); + + applySetProjectsInvites(invites: Invite[]): void { + this.allInvites.set(inviteToProjectMapper(invites)); + } + + applyAcceptOrRejectInvite(inviteId: number): void { + this.allInvites.update(list => list.filter(invite => invite.inviteId !== inviteId)); + } +} diff --git a/projects/social_platform/src/app/api/searches/searches.service.ts b/projects/social_platform/src/app/api/searches/searches.service.ts new file mode 100644 index 00000000..a84a01ff --- /dev/null +++ b/projects/social_platform/src/app/api/searches/searches.service.ts @@ -0,0 +1,33 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { Subject, take, takeUntil } from "rxjs"; +import { Specialization } from "../../domain/specializations/specialization"; +import { FormGroup } from "@angular/forms"; +import { SpecializationsService } from "../specializations/specializations.service"; + +@Injectable({ providedIn: "root" }) +export class SearchesService { + private readonly specsService = inject(SpecializationsService); + + readonly inlineSpecs = signal([]); + + private readonly destroy$ = new Subject(); + + /** + * Выбор специальности из автокомплита + * @param speciality - выбранная специальность + */ + onSelectSpec(form: FormGroup, speciality: Specialization): void { + form.patchValue({ speciality: speciality.name }); + } + + onSearchSpec(query: string): void { + this.specsService + .getSpecializationsInline(query, 1000, 0) + .pipe(take(1), takeUntil(this.destroy$)) + .subscribe(({ results }) => { + this.inlineSpecs.set(results); + }); + } +} diff --git a/projects/social_platform/src/app/api/skills/facades/skills-info.service.ts b/projects/social_platform/src/app/api/skills/facades/skills-info.service.ts new file mode 100644 index 00000000..42ca6196 --- /dev/null +++ b/projects/social_platform/src/app/api/skills/facades/skills-info.service.ts @@ -0,0 +1,67 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { Subject } from "rxjs"; +import { Skill } from "../../../domain/skills/skill"; +import { FormGroup } from "@angular/forms"; +import { SkillsService } from "../skills.service"; + +@Injectable({ providedIn: "root" }) +export class SkillsInfoService { + private readonly skillsService = inject(SkillsService); + + private readonly destroy$ = new Subject(); + + readonly inlineSkills = signal([]); + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + /** + * Переключение навыка (добавление/удаление) + * @param toggledSkill - навык для переключения + */ + onToggleSkill(toggledSkill: Skill, form: FormGroup): void { + const { skills }: { skills: Skill[] } = form.value; + + const isPresent = skills.some(skill => skill.id === toggledSkill.id); + + if (isPresent) { + this.onRemoveSkill(toggledSkill, form); + } else { + this.onAddSkill(toggledSkill, form); + } + } + + /** + * Добавление нового навыка + * @param newSkill - новый навык для добавления + */ + onAddSkill(newSkill: Skill, form: FormGroup): void { + const { skills }: { skills: Skill[] } = form.value; + + const isPresent = skills.some(skill => skill.id === newSkill.id); + + if (isPresent) return; + + form.patchValue({ skills: [newSkill, ...skills] }); + } + + /** + * Удаление навыка + * @param oddSkill - навык для удаления + */ + onRemoveSkill(oddSkill: Skill, form: FormGroup): void { + const { skills }: { skills: Skill[] } = form.value; + + form.patchValue({ skills: skills.filter(skill => skill.id !== oddSkill.id) }); + } + + onSearchSkill(query: string): void { + this.skillsService.getSkillsInline(query, 1000, 0).subscribe(({ results }) => { + this.inlineSkills.set(results); + }); + } +} diff --git a/projects/social_platform/src/app/api/swipe/swipe.service.ts b/projects/social_platform/src/app/api/swipe/swipe.service.ts new file mode 100644 index 00000000..b5e6362b --- /dev/null +++ b/projects/social_platform/src/app/api/swipe/swipe.service.ts @@ -0,0 +1,51 @@ +/** @format */ + +import { ElementRef, inject, Injectable, Renderer2, signal } from "@angular/core"; + +@Injectable() +export class SwipeService { + private readonly renderer = inject(Renderer2); + + private swipeStartY = signal(0); + private swipeThreshold = signal(50); + private isSwiping = signal(false); + isFilterOpen = signal(false); + + onSwipeStart(event: TouchEvent): void { + this.swipeStartY.set(event.touches[0].clientY); + this.isSwiping.set(true); + } + + onSwipeMove(event: TouchEvent, filterBody: ElementRef): void { + if (!this.isSwiping) return; + + const currentY = event.touches[0].clientY; + const deltaY = currentY - this.swipeStartY(); + + const progress = Math.min(deltaY / this.swipeThreshold(), 1); + this.renderer.setStyle( + filterBody.nativeElement, + "transform", + `translateY(${progress * 100}px)` + ); + } + + onSwipeEnd(event: TouchEvent, filterBody: ElementRef): void { + if (!this.isSwiping) return; + + const endY = event.changedTouches[0].clientY; + const deltaY = endY - this.swipeStartY(); + + if (deltaY > this.swipeThreshold()) { + this.closeFilter(); + } + + this.isSwiping.set(false); + + this.renderer.setStyle(filterBody.nativeElement, "transform", "translateY(0)"); + } + + closeFilter(): void { + this.isFilterOpen.set(false); + } +} diff --git a/projects/social_platform/src/app/api/tooltip/tooltip-info.service.ts b/projects/social_platform/src/app/api/tooltip/tooltip-info.service.ts new file mode 100644 index 00000000..ae2174b6 --- /dev/null +++ b/projects/social_platform/src/app/api/tooltip/tooltip-info.service.ts @@ -0,0 +1,134 @@ +/** @format */ + +import { Injectable, signal } from "@angular/core"; + +@Injectable() +export class TooltipInfoService { + readonly isTooltipVisible = signal(false); + + readonly isHintPhotoVisible = signal(false); + readonly isHintCityVisible = signal(false); + readonly isHintEducationVisible = signal(false); + readonly isHintEducationDescriptionVisible = signal(false); + readonly isHintWorkVisible = signal(false); + readonly isHintWorkNameVisible = signal(false); + readonly isHintWorkDescriptionVisible = signal(false); + readonly isHintAchievementsVisible = signal(false); + readonly isHintLanguageVisible = signal(false); + readonly isHintAuthVisible = signal(false); + readonly isHintLibVisible = signal(false); + + /** Показать подсказку */ + showTooltip( + type: + | "base" + | "photo" + | "city" + | "education" + | "educationDescription" + | "work" + | "workName" + | "workDescription" + | "achievements" + | "language" + | "auth" + | "lib" = "base" + ): void { + switch (type) { + case "photo": + this.isHintPhotoVisible.set(true); + break; + case "city": + this.isHintCityVisible.set(true); + break; + case "education": + this.isHintEducationVisible.set(true); + break; + case "educationDescription": + this.isHintEducationDescriptionVisible.set(true); + break; + case "work": + this.isHintWorkVisible.set(true); + break; + case "workName": + this.isHintWorkNameVisible.set(true); + break; + case "workDescription": + this.isHintWorkDescriptionVisible.set(true); + break; + case "achievements": + this.isHintAchievementsVisible.set(true); + break; + case "language": + this.isHintLanguageVisible.set(true); + break; + case "auth": + this.isHintAuthVisible.set(true); + break; + case "lib": + this.isHintLibVisible.set(true); + break; + + default: + this.isTooltipVisible.set(true); + break; + } + } + + /** Скрыть подсказку */ + hideTooltip( + type: + | "base" + | "photo" + | "city" + | "education" + | "educationDescription" + | "work" + | "workName" + | "workDescription" + | "achievements" + | "language" + | "auth" + | "lib" = "base" + ): void { + switch (type) { + case "photo": + this.isHintPhotoVisible.set(false); + break; + case "city": + this.isHintCityVisible.set(false); + break; + case "education": + this.isHintEducationVisible.set(false); + break; + case "educationDescription": + this.isHintEducationDescriptionVisible.set(false); + break; + case "work": + this.isHintWorkVisible.set(false); + break; + case "workName": + this.isHintWorkNameVisible.set(false); + break; + case "workDescription": + this.isHintWorkDescriptionVisible.set(false); + break; + case "achievements": + this.isHintAchievementsVisible.set(false); + break; + case "language": + this.isHintLanguageVisible.set(false); + break; + case "auth": + this.isHintAuthVisible.set(false); + break; + case "lib": + this.isHintLibVisible.set(false); + break; + + default: + this.isTooltipVisible.set(false); + break; + } + } +} diff --git a/projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-detail-ui-info.service.ts b/projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-detail-ui-info.service.ts new file mode 100644 index 00000000..6dfc16eb --- /dev/null +++ b/projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-detail-ui-info.service.ts @@ -0,0 +1,47 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder, Validators } from "@angular/forms"; +import { Params } from "@angular/router"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; + +@Injectable() +export class VacancyDetailUIInfoService { + private readonly fb = inject(FormBuilder); + + readonly vacancy = signal(undefined); + + readonly openModal = signal(false); + readonly resultModal = signal(false); + readonly sendFormIsSubmitting = signal(false); + + // Создание формы отклика с валидацией + readonly sendForm = this.fb.group({ + whyMe: ["", [Validators.required, Validators.minLength(20), Validators.maxLength(2000)]], + accompanyingFile: ["", Validators.required], + }); + + applySetVacancies(vacancy: Vacancy): void { + this.vacancy.set(vacancy); + } + + applyNoResponseOpenModal(data: Params): void { + if (data["sendResponse"]) { + this.openModal.set(true); + } + } + + applySubmitVacancyResponse(): void { + this.sendFormIsSubmitting.set(false); + this.resultModal.set(true); + this.applyNoResponseCloseModal(); + } + + applyErrorFormSubmit(): void { + this.sendFormIsSubmitting.set(false); + } + + applyNoResponseCloseModal(): void { + this.openModal.set(false); + } +} diff --git a/projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-ui-info.service.ts b/projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-ui-info.service.ts new file mode 100644 index 00000000..863cc1d2 --- /dev/null +++ b/projects/social_platform/src/app/api/vacancy/facades/ui/vacancy-ui-info.service.ts @@ -0,0 +1,107 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormBuilder } from "@angular/forms"; +import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model"; +import { VacancyResponse } from "projects/social_platform/src/app/domain/vacancy/vacancy-response.model"; +import { Vacancy } from "projects/social_platform/src/app/domain/vacancy/vacancy.model"; + +@Injectable() +export class VacancyUIInfoService { + private readonly fb = inject(FormBuilder); + // Переменная определяющая тип страницы для списка данных и пагинации + + readonly listType = signal<"all" | "my" | null>(null); + readonly totalItemsCount = signal(0); + readonly vacancyPage = signal(1); + readonly perFetchTake = signal(20); + + // Переменные для работы с фильтрами + + readonly requiredExperience = signal(undefined); + readonly roleContains = signal(undefined); + readonly workFormat = signal(undefined); + readonly workSchedule = signal(undefined); + readonly salary = signal(undefined); + + // Переменные для работы с модалкой + + readonly isMyModal = signal(false); + + // Переменные для списка вакансий и пагинации + + readonly vacancyList = signal([]); + readonly responsesList = signal([]); + + readonly searchForm = this.fb.group({ + search: [""], + }); + + applyQueryParams(result: ApiPagination | ApiPagination): void { + this.applySetTotalItems(result); + this.vacancyPage.set(1); + } + + applyVacancyListData(result: ApiPagination | ApiPagination): void { + if (!result || !Array.isArray(result.results)) { + return; + } + + if (this.listType() === "all") { + this.vacancyList.set(result.results as Vacancy[]); + } else if (this.listType() === "my") { + this.responsesList.set(result.results as VacancyResponse[]); + } + } + + applySetTotalItems(vacancy: ApiPagination | ApiPagination): void { + if (!vacancy || typeof vacancy.count !== "number") { + this.totalItemsCount.set(0); + return; + } + + this.totalItemsCount.set(vacancy.count); + } + + applyUpdateListOnScroll(result: any): void { + this.vacancyPage.update(page => page + 1); + this.vacancyList.update(items => [...items, ...result.results]); + } + + applySearhValueChanged(searchValue: string) { + this.searchForm.get("search")?.setValue(searchValue); + } + + // myVacanciesPage Modal Section + // ------------------- + + myModalSetup() { + if (this.listType() === "my" && this.responsesList().length === 0) { + this.isMyModal.set(true); + } else { + this.isMyModal.set(false); + } + } + + setFilters( + requiredExperience: any, + roleContains: any, + workFormat: any, + workSchedule: any, + salary: any + ): void { + this.requiredExperience.set(requiredExperience); + this.roleContains.set(roleContains); + this.workFormat.set(workFormat); + this.workSchedule.set(workSchedule); + this.salary.set(salary); + } + + resetFilters(): void { + this.requiredExperience.set(undefined); + this.roleContains.set(undefined); + this.workFormat.set(undefined); + this.workSchedule.set(undefined); + this.salary.set(undefined); + } +} diff --git a/projects/social_platform/src/app/api/vacancy/facades/vacancy-detail-info.service.ts b/projects/social_platform/src/app/api/vacancy/facades/vacancy-detail-info.service.ts new file mode 100644 index 00000000..e54d28b6 --- /dev/null +++ b/projects/social_platform/src/app/api/vacancy/facades/vacancy-detail-info.service.ts @@ -0,0 +1,93 @@ +/** @format */ + +import { ElementRef, inject, Injectable } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; +import { filter, map, Subject, takeUntil } from "rxjs"; +import { ValidationService } from "@corelib"; +import { VacancyService } from "../vacancy.service"; +import { VacancyDetailUIInfoService } from "./ui/vacancy-detail-ui-info.service"; +import { ExpandService } from "../../expand/expand.service"; + +@Injectable() +export class VacancyDetailInfoService { + private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); + private readonly vacancyService = inject(VacancyService); + private readonly vacancyDetailUIInfoService = inject(VacancyDetailUIInfoService); + private readonly validationService = inject(ValidationService); + private readonly expandService = inject(ExpandService); + + private readonly destroy$ = new Subject(); + + private readonly vacancy = this.vacancyDetailUIInfoService.vacancy; + private readonly sendForm = this.vacancyDetailUIInfoService.sendForm; + private readonly sendFormIsSubmitting = this.vacancyDetailUIInfoService.sendFormIsSubmitting; + + initializeDetailInfo(): void { + this.route.data + .pipe( + map(r => r["data"]), + filter(Boolean), + takeUntil(this.destroy$) + ) + .subscribe(vacancy => { + this.vacancyDetailUIInfoService.applySetVacancies(vacancy); + }); + } + + initializeDetailInfoQueryParams(): void { + this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe({ + next: r => { + this.vacancyDetailUIInfoService.applyNoResponseOpenModal(r); + }, + }); + } + + initCheckDescription(descEl?: ElementRef): void { + setTimeout(() => { + this.expandService.checkExpandable("description", !!this.vacancy()?.description, descEl); + }, 150); + } + + initCheckSkills(descEl?: ElementRef): void { + setTimeout(() => { + this.expandService.checkExpandable("skills", !!this.vacancy()?.requiredSkills.length, descEl); + }, 150); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + submitVacancyResponse(): void { + if (!this.validationService.getFormValidation(this.sendForm)) { + return; + } + + this.sendFormIsSubmitting.set(true); + + this.vacancyService + .sendResponse( + Number(this.route.snapshot.paramMap.get("vacancyId")), + this.sendForm.value as any + ) + .subscribe({ + next: () => { + this.vacancyDetailUIInfoService.applySubmitVacancyResponse(); + }, + error: () => { + this.vacancyDetailUIInfoService.applyErrorFormSubmit(); + }, + }); + } + + closeSendResponseModal(): void { + this.vacancyDetailUIInfoService.applyNoResponseCloseModal(); + + this.router.navigate([], { + queryParams: {}, + replaceUrl: true, + }); + } +} diff --git a/projects/social_platform/src/app/api/vacancy/facades/vacancy-info.service.ts b/projects/social_platform/src/app/api/vacancy/facades/vacancy-info.service.ts new file mode 100644 index 00000000..f23c4982 --- /dev/null +++ b/projects/social_platform/src/app/api/vacancy/facades/vacancy-info.service.ts @@ -0,0 +1,227 @@ +/** @format */ + +import { inject, Injectable, signal } from "@angular/core"; +import { FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; +import { + concatMap, + debounceTime, + distinctUntilChanged, + EMPTY, + fromEvent, + map, + Observable, + Subject, + switchMap, + takeUntil, + tap, + throttleTime, +} from "rxjs"; +import { VacancyResponse } from "../../../domain/vacancy/vacancy-response.model"; +import { Vacancy } from "../../../domain/vacancy/vacancy.model"; +import { ApiPagination } from "../../../domain/other/api-pagination.model"; +import { VacancyService } from "../vacancy.service"; +import { VacancyUIInfoService } from "./ui/vacancy-ui-info.service"; + +@Injectable() +export class VacancyInfoService { + private readonly router = inject(Router); + private readonly route = inject(ActivatedRoute); + private readonly vacancyService = inject(VacancyService); + private readonly vacancyUIInfoService = inject(VacancyUIInfoService); + + private readonly destroy$ = new Subject(); + + readonly listType = this.vacancyUIInfoService.listType; + readonly vacancyList = this.vacancyUIInfoService.vacancyList; + readonly responsesList = this.vacancyUIInfoService.responsesList; + + // Переменные для работы с фильтрами + + readonly requiredExperience = this.vacancyUIInfoService.requiredExperience; + readonly roleContains = this.vacancyUIInfoService.roleContains; + readonly workFormat = this.vacancyUIInfoService.workFormat; + readonly workSchedule = this.vacancyUIInfoService.workSchedule; + readonly salary = this.vacancyUIInfoService.salary; + + // Search Section + // -------------- + + onSearchSubmit(searchValue?: string | null): void { + this.router.navigate([], { + queryParams: { role_contains: searchValue || null }, + queryParamsHandling: "merge", + relativeTo: this.route, + }); + } + + initializationSearchValueForm(): void { + this.vacancyUIInfoService.searchForm + .get("search") + ?.valueChanges.pipe(debounceTime(300), distinctUntilChanged(), takeUntil(this.destroy$)) + .subscribe(value => this.onSearchSubmit(value)); + } + + // Initialization + // -------------- + + init(): void { + this.initializeListType(); + this.initializeListData(); + + if (this.listType() === "all") { + this.initializeQueryParams(); + } + + if (this.listType() === "my") { + this.vacancyUIInfoService.resetFilters(); + this.clearQueryParams(); + } + + this.vacancyUIInfoService.myModalSetup(); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + // ListType Section + // ---------------- + + initializeListType(): void { + const segment = this.router.url.split("/").pop()?.split("?")[0]; + this.listType.set(segment as "all" | "my"); + } + + // ListItems Section + // ----------------- + + initializeListData(): void { + const routeData$ = + this.listType() === "all" + ? this.route.data.pipe(map(r => r["data"])) + : this.route.data.pipe(map(r => r["data"])); + + routeData$ + .pipe(takeUntil(this.destroy$)) + .subscribe((vacancy: ApiPagination | ApiPagination) => { + if (vacancy) { + this.vacancyUIInfoService.applyVacancyListData(vacancy); + this.vacancyUIInfoService.applySetTotalItems(vacancy); + } + }); + } + + // QueryParams Section + // ------------------- + + initializeQueryParams(): void { + this.route.queryParams + .pipe( + debounceTime(200), + takeUntil(this.destroy$), + tap(params => { + const requiredExperience = params["required_experience"] + ? params["required_experience"] + : undefined; + + const roleContains = params["role_contains"] || undefined; + const workFormat = params["work_format"] ? params["work_format"] : undefined; + const workSchedule = params["work_schedule"] ? params["work_schedule"] : undefined; + const salary = params["salary"] ? params["salary"] : undefined; + + this.vacancyUIInfoService.setFilters( + requiredExperience, + roleContains, + workFormat, + workSchedule, + salary + ); + }), + switchMap(() => this.onFetch(0, 20)) + ) + .subscribe((result: any) => { + this.vacancyUIInfoService.applyVacancyListData(result); + this.vacancyUIInfoService.applyQueryParams(result); + }); + } + + // onScroll Section + // ------------------- + + onScroll(target: HTMLElement): Observable { + if ( + this.vacancyUIInfoService.totalItemsCount() && + this.vacancyList().length >= this.vacancyUIInfoService.totalItemsCount() + ) + return EMPTY; + + if (!target) return EMPTY; + + const diff = target.scrollTop - target.scrollHeight + target.clientHeight; + + if (diff > 0) { + return this.onFetch( + this.vacancyUIInfoService.vacancyPage() * this.vacancyUIInfoService.perFetchTake(), + this.vacancyUIInfoService.perFetchTake() + ).pipe( + tap((result: any) => { + this.vacancyUIInfoService.applyUpdateListOnScroll(result); + }) + ); + } + + return EMPTY; + } + + // target for Scroll Section + // ------------------- + + initScroll(target: HTMLElement): void { + if (target) { + fromEvent(target, "scroll") + .pipe( + throttleTime(500), + concatMap(() => this.onScroll(target)), + takeUntil(this.destroy$) + ) + .subscribe(); + } + } + + // QueryParams Section + // ------------------- + + onFetch(offset: number, limit: number) { + return this.vacancyService + .getForProject( + limit, + offset, + undefined, + this.requiredExperience(), + this.workFormat(), + this.workSchedule(), + this.salary(), + this.roleContains() + ) + .pipe(map(res => res)); + } + + // other methods Section + // ------------------- + + private clearQueryParams(): void { + this.router.navigate([], { + relativeTo: this.route, + queryParams: { + role_contains: null, + required_experience: null, + work_format: null, + work_schedule: null, + salary: null, + }, + queryParamsHandling: "merge", + }); + } +} diff --git a/projects/social_platform/src/app/domain/auth/register.model.ts b/projects/social_platform/src/app/domain/auth/register.model.ts new file mode 100644 index 00000000..3039b6d1 --- /dev/null +++ b/projects/social_platform/src/app/domain/auth/register.model.ts @@ -0,0 +1,10 @@ +/** @format */ + +export class RegisterRequest { + firstName!: string; + lastName!: string; + birthday!: string; + email!: string; + password!: string; + repeatedPassword!: string; +} diff --git a/projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-info.service.ts b/projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-info.service.ts new file mode 100644 index 00000000..d635f50a --- /dev/null +++ b/projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-info.service.ts @@ -0,0 +1,97 @@ +import { inject, Injectable } from "@angular/core"; +import { ActivatedRoute } from "@angular/router"; +import { AuthService } from "projects/social_platform/src/app/api/auth"; +import { ProjectsDetailUIInfoService } from "projects/social_platform/src/app/api/project/facades/detail/ui/projects-detail-ui.service"; +import { ProfileService as ProfileApproveSkillService } from "../../../../api/auth/profile.service"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; +import { map, of, Subject, switchMap, takeUntil } from "rxjs"; +import { HttpErrorResponse } from "@angular/common/http"; +import { ApproveSkillUIInfoService } from "./approve-skill-ui-info.service"; + +@Injectable() +export class ApproveskillInfoService { + private readonly authService = inject(AuthService); + private readonly projectsDetailUIInfoService = inject(ProjectsDetailUIInfoService); + private readonly route = inject(ActivatedRoute); + private readonly profileApproveSkillService = inject(ProfileApproveSkillService); + private readonly approveSkillUIInfoService = inject(ApproveSkillUIInfoService); + + private readonly destroy$ = new Subject(); + + private readonly loggedUserId = this.projectsDetailUIInfoService.loggedUserId; + + init(): void { + this.authService.profile.pipe(takeUntil(this.destroy$)).subscribe({ + next: profile => { + this.projectsDetailUIInfoService.applySetLoggedUserId('logged', profile.id); + }, + }); + } + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + // Указатель на то что пользватель подтвердил навык + isUserApproveSkill(skill: Skill): boolean { + return skill.approves.some(approve => approve.confirmedBy.id === this.loggedUserId()); + } + + unApproveSkill(userId: number, skillId: number, skill: Skill): void { + this.profileApproveSkillService.unApproveSkill(userId, skillId).subscribe(() => { + skill.approves = skill.approves.filter(approve => approve.confirmedBy.id !== this.loggedUserId()); + }); + } + + approveSkill(userId: number, skillId: number, skill: Skill): void { + this.profileApproveSkillService + .approveSkill(userId, skillId) + .pipe( + switchMap(newApprove => + newApprove.confirmedBy + ? of(newApprove) + : this.authService.profile.pipe( + map(profile => ({ + ...newApprove, + confirmedBy: profile, + })) + ) + ), + takeUntil(this.destroy$) + ) + .subscribe({ + next: updatedApprove => { + this.approveSkillUIInfoService.applyApprovedSkills(skill, updatedApprove); + }, + error: err => { + if (err instanceof HttpErrorResponse) { + if (err.status === 400) { + this.approveSkillUIInfoService.applyOpenErrorModal(); + } + } + }, + }); + } + + /** + * Подтверждение или отмена подтверждения навыка пользователя + * @param skillId - идентификатор навыка + * @param event - событие клика для предотвращения всплытия + * @param skill - объект навыка для обновления + */ + onToggleApprove(skillId: number, event: Event, skill: Skill) { + event.stopPropagation(); + const userId = this.route.snapshot.params["id"]; + + const isApprovedByCurrentUser = skill.approves.some(approve => { + return approve.confirmedBy.id === this.loggedUserId(); + }); + + if (isApprovedByCurrentUser) { + this.unApproveSkill(userId, skillId, skill); + } else { + this.approveSkill(userId, skillId, skill); + } + } +} diff --git a/projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-ui-info.service.ts b/projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-ui-info.service.ts new file mode 100644 index 00000000..b5431d45 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/approve-skill/services/approve-skill-ui-info.service.ts @@ -0,0 +1,20 @@ +import { inject, Injectable, signal } from "@angular/core"; +import { SnackbarService } from "@ui/services/snackbar/snackbar.service"; +import { Approve, Skill } from "projects/social_platform/src/app/domain/skills/skill"; + +@Injectable() +export class ApproveSkillUIInfoService { + private readonly snackbarService = inject(SnackbarService); + + // переменные для работы с модальным окном для вывода ошибки с подтверждением своего навыка + approveOwnSkillModal = signal(false); + + applyApprovedSkills(skill: Skill, updatedApprove: Approve): void { + skill.approves = [...skill.approves, updatedApprove]; + this.snackbarService.success("вы подтвердили навык"); + } + + applyOpenErrorModal(): void { + this.approveOwnSkillModal.set(true); + } +} diff --git a/projects/social_platform/src/app/ui/components/detail/services/detail-info.service.ts b/projects/social_platform/src/app/ui/components/detail/services/detail-info.service.ts new file mode 100644 index 00000000..d4e7395d --- /dev/null +++ b/projects/social_platform/src/app/ui/components/detail/services/detail-info.service.ts @@ -0,0 +1,25 @@ +import { Injectable, signal } from "@angular/core"; +import { Subject } from "rxjs"; + +@Injectable() +export class DetailInfoService { + destroy$ = new Subject(); + + info = signal(undefined); + listType: "project" | "program" | "profile" = "project"; + + // Сторонние переменные для работы с роутингом или доп проверок + backPath?: string; + isInProject?: boolean; + + // для проекта + isTeamPage = signal(false); + isVacanciesPage = signal(false); + isProjectChatPage = signal(false); + isProjectWorkSectionPage = signal(false); + + destroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/projects/social_platform/src/app/ui/components/detail/services/project/detail-project-info.service.ts b/projects/social_platform/src/app/ui/components/detail/services/project/detail-project-info.service.ts new file mode 100644 index 00000000..45bec07b --- /dev/null +++ b/projects/social_platform/src/app/ui/components/detail/services/project/detail-project-info.service.ts @@ -0,0 +1,6 @@ +import { Injectable } from "@angular/core"; + +@Injectable() +export class DetailProjectInfoService { + +} diff --git a/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.html b/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.html new file mode 100644 index 00000000..31d8c575 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.html @@ -0,0 +1,25 @@ + + + diff --git a/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.scss b/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.scss new file mode 100644 index 00000000..abc84122 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.scss @@ -0,0 +1,81 @@ +/** @format */ + +@use "styles/responsive"; +@use "styles/typography"; + +.project { + &__navigation { + padding: 22px 0; + margin-bottom: 22px; + border-bottom: 1px solid var(--grey-button); + } + + &__nav { + display: flex; + flex-wrap: wrap; + gap: 10px; + align-items: center; + justify-content: center; + padding: 2px 10px; + background-color: var(--medium-grey-for-outline); + border-radius: var(--rounded-xxl); + + @include responsive.apply-desktop { + gap: 0; + justify-content: space-between; + } + } + + &__item { + display: flex; + gap: 5px; + align-items: center; + cursor: pointer; + + &--active { + padding: 0 8px; + margin-right: -8px; + margin-left: -8px; + background-color: var(--white); + border-radius: var(--rounded-xxl); + } + } + + &__subtitle { + color: var(--dark-grey); + + @include typography.body-12; + + &--active { + color: var(--black); + } + } + + &__icon { + opacity: 0.1; + + &--active { + color: var(--accent); + opacity: 1; + } + } + + &__nav-item { + color: var(--dark-grey); + cursor: pointer; + + @include typography.heading-4; + + @include responsive.apply-desktop { + @include typography.heading-3; + } + + &:not(:last-child) { + margin-right: 24px; + } + + &--active { + color: var(--black); + } + } +} diff --git a/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.ts b/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.ts new file mode 100644 index 00000000..8a2d0de6 --- /dev/null +++ b/projects/social_platform/src/app/ui/components/project-navigation/project-navigation.component.ts @@ -0,0 +1,26 @@ +/** @format */ + +import { Component, inject, Output, EventEmitter, Input } from "@angular/core"; +import { IconComponent } from "@uilib"; +import { CommonModule } from "@angular/common"; +import { EditStep, ProjectStepService } from "../../../api/project/project-step.service"; + +@Component({ + selector: "app-project-navigation", + templateUrl: "./project-navigation.component.html", + styleUrl: "project-navigation.component.scss", + imports: [IconComponent, CommonModule], + standalone: true, +}) +export class ProjectNavigationComponent { + @Input() navItems!: any[]; + @Output() stepChange = new EventEmitter(); + + private readonly projectStepService = inject(ProjectStepService); + + protected readonly currentStep = this.projectStepService.currentStep; + + onStepClick(step: EditStep): void { + this.projectStepService.navigateToStep(step); + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.html b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.html new file mode 100644 index 00000000..301ff4b8 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.html @@ -0,0 +1,150 @@ + + +
    +
    + @if (showAchievementsFields()) { +
    + @if (profileForm.get("title"); as title) { +
    + + + @if (title | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("year"); as year) { +
    + + + @if (year | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("status"); as status) { +
    + + + @if (status | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("files"); as files) { +
    + + + +

    + файл или изображение
    + с сертификатом подтверждающим
    + достижение весом до 50МБ +

    + @if (files | controlError: "required") { +

    загрузите файл

    + } +     +     +
    + } +
    + } + + {{ editAchievementsClick() ? "сохранить изменения" : "добавить достижение" }} + + +
    + +
    + @if(achievementItems().length || achievements.length){ @for (achievementItem of + achievements.value; track $index) { +
    +
    +
    +

    + {{ achievementItem.title }} +

    + +

    + {{ achievementItem.year }} +

    + +

    + {{ achievementItem.status }} +

    + + @if (achievementItem.files?.length) { @if (isStringFiles(achievementItem.files)) { + + + } @else { @for (file of achievementItem.files; track $index) { + + + } } } +
    + +
    +
    + +
    + +
    + +
    +
    +
    +
    + } } +
    +
    diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.scss b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.scss new file mode 100644 index 00000000..9969091c --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.scss @@ -0,0 +1,114 @@ +.profile__wrapper--education { + display: grid; + grid-template-columns: 6fr 4fr; + grid-gap: 20px; +} + +.profile__info--education { + display: flex; + flex-direction: column; + gap: 12px; +} + +.profile__education--list { + display: flex; + flex-direction: column; + gap: 20px; +} + +.profile__language--list { + display: grid; + grid-template-columns: 2fr 2fr; + grid-gap: 20px; +} + +.profile__wrapper--links { + display: grid; + grid-template-columns: 7fr 3fr; + grid-gap: 20px; +} + +.profile__education--card { + display: flex; + align-items: center; + justify-content: space-between; +} + +.profile__education--info { + display: flex; + flex-direction: column; + gap: 5px; + + :first-child { + color: var(--black); + } + + :last-child & app-file-item { + margin-top: 3px; + } +} + +.edit-icon, +.basket-icon { + width: 20px; + height: 20px; + padding: 6px; + cursor: pointer; + border-radius: 50%; +} + +.edit-icon { + border: 0.5px solid var(--accent); + + i { + color: var(--accent) !important; + } +} + +.basket-icon { + border: 0.5px solid var(--red); + + i { + color: var(--red) !important; + } +} + +.education { + &__title { + display: flex; + align-items: center; + justify-content: space-between; + padding-bottom: 5px; + border-bottom: 0.5px solid var(--medium-grey-for-outline); + } + + &__text { + color: var(--grey-for-text); + word-break: break-word; + overflow-wrap: anywhere; + white-space: wrap; + } +} + +.profile { + &__column { + display: flex; + flex-direction: column; + gap: 12px; + + &--date { + display: grid; + grid-template-columns: repeat(2, 3fr); + grid-gap: 20px; + } + } + + &__action { + &--icons { + display: flex; + flex-direction: column; + gap: 10px; + align-items: center; + } + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.ts b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.ts new file mode 100644 index 00000000..7be56b28 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-achievements-step/profile-achievements-step.component.ts @@ -0,0 +1,73 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, Input, Output, EventEmitter } from "@angular/core"; +import { InputComponent, SelectComponent, ButtonComponent } from "@ui/components"; +import { TextareaComponent } from "@ui/components/textarea/textarea.component"; +import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; +import { FileItemComponent } from "@ui/components/file-item/file-item.component"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ProfileEditComponent } from "../../edit.component"; +import { ProfileFormService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-form.service"; +import { ReactiveFormsModule } from "@angular/forms"; +import { ControlErrorPipe } from "@corelib"; +import { ProfileEditAchievementsInfoService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-edit-achievements-info.service"; +import { IconComponent } from "@uilib"; + +@Component({ + selector: "app-profile-achievements-step", + templateUrl: "./profile-achievements-step.component.html", + styleUrl: "./profile-achievements-step.component.scss", + imports: [ + CommonModule, + InputComponent, + IconComponent, + SelectComponent, + TextareaComponent, + UploadFileComponent, + ButtonComponent, + FileItemComponent, + ReactiveFormsModule, + ControlErrorPipe, + ], + providers: [ProfileEditAchievementsInfoService], + standalone: true, +}) +export class ProfileAchievementsStepComponent { + @Input() isAchievementsDirty: any; + protected readonly errorMessage = ErrorMessage; + + private readonly profileFormService = inject(ProfileFormService); + private readonly profileEditAchievementsInfoService = inject(ProfileEditAchievementsInfoService); + + protected readonly profileForm = this.profileFormService.getForm(); + protected readonly achievementItems = this.profileEditAchievementsInfoService.achievementItems; + protected readonly achievements = this.profileFormService.achievements; + + protected readonly achievementsYearList = this.profileFormService.achievementsYearList; + + protected readonly showAchievementsFields = + this.profileEditAchievementsInfoService.showAchievementsFields; + + protected readonly editAchievementsClick = + this.profileEditAchievementsInfoService.editAchievementsClick; + + protected readonly selectedAchievementsYearId = + this.profileEditAchievementsInfoService.selectedAchievementsYearId; + + protected isStringFiles(files: any[]): boolean { + return typeof files === "string"; + } + + protected addAchievement(): void { + this.profileEditAchievementsInfoService.addAchievement(); + } + + protected editAchievements(index: number): void { + this.profileEditAchievementsInfoService.editAchievements(index); + } + + protected removeAchievement(index: number): void { + this.profileEditAchievementsInfoService.removeAchievement(index); + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.html b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.html new file mode 100644 index 00000000..7b0edcaf --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.html @@ -0,0 +1,191 @@ + + +
    +
    + @if (showEducationFields()) { +
    + @if (profileForm.get("entryYear"); as entryYear) { +
    + + + + + + @if (entryYear | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } @if (profileForm.get("completionYear"); as completionYear) { +
    + + + + + @if (completionYear | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("organizationName"); as organizationName) { +
    + + + @if (organizationName | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("description"); as description) { +
    + + + @if (description | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("educationLevel"); as educationLevel) { +
    + + + + + @if (educationLevel | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("educationStatus"); as educationStatus) { +
    + + + + + @if (educationStatus | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + } + + + {{ editEducationClick() ? "сохранить изменения" : "добавить образование" }} + + +
    + +
    + @if(educationItems().length || education.length){ @for (educationItem of education.value; track + $index) { +
    +

    + {{ educationItem.organizationName }} +

    + +

    + @if(educationItem.entryYear && educationItem.completionYear) { + {{ educationItem.entryYear }} год • {{ educationItem.completionYear }} год } @else if + (educationItem.entryYear && !educationItem.completionYear) { + {{ educationItem.entryYear }} год } @else if (!educationItem.entryYear && + educationItem.completionYear){ {{ educationItem.completionYear }} год } +

    + +
    +
    +

    + {{ educationItem.description }} +

    + +

    + {{ educationItem.educationLevel }} +

    + +

    + {{ educationItem.educationStatus }} +

    +
    + +
    +
    + +
    + +
    + +
    +
    +
    +
    + } } +
    +
    diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.scss b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.scss new file mode 100644 index 00000000..88a62014 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.scss @@ -0,0 +1,108 @@ +.profile__wrapper--education { + display: grid; + grid-template-columns: 6fr 4fr; + grid-gap: 20px; +} + +.profile__info--education { + display: flex; + flex-direction: column; + gap: 12px; +} + +.profile__education--list { + display: flex; + flex-direction: column; + gap: 20px; +} + +.profile__language--list { + display: grid; + grid-template-columns: 2fr 2fr; + grid-gap: 20px; +} + +.profile__education--card { + display: flex; + align-items: center; + justify-content: space-between; +} + +.profile__education--info { + display: flex; + flex-direction: column; + gap: 5px; + + :first-child { + color: var(--black); + } + + :last-child & app-file-item { + margin-top: 3px; + } +} + +.edit-icon, +.basket-icon { + width: 20px; + height: 20px; + padding: 6px; + cursor: pointer; + border-radius: 50%; +} + +.edit-icon { + border: 0.5px solid var(--accent); + + i { + color: var(--accent) !important; + } +} + +.basket-icon { + border: 0.5px solid var(--red); + + i { + color: var(--red) !important; + } +} + +.education { + &__title { + display: flex; + align-items: center; + justify-content: space-between; + padding-bottom: 5px; + border-bottom: 0.5px solid var(--medium-grey-for-outline); + } + + &__text { + color: var(--grey-for-text); + word-break: break-word; + overflow-wrap: anywhere; + white-space: wrap; + } +} + +.profile { + &__column { + display: flex; + flex-direction: column; + gap: 12px; + + &--date { + display: grid; + grid-template-columns: repeat(2, 3fr); + grid-gap: 20px; + } + } + + &__action { + &--icons { + display: flex; + flex-direction: column; + gap: 10px; + align-items: center; + } + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.ts b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.ts new file mode 100644 index 00000000..c429db60 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-education-step/profile-education-step.component.ts @@ -0,0 +1,72 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, Input } from "@angular/core"; +import { ReactiveFormsModule } from "@angular/forms"; +import { ControlErrorPipe } from "@corelib"; +import { IconComponent } from "@uilib"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { SelectComponent, ButtonComponent, InputComponent } from "@ui/components"; +import { ProfileFormService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-form.service"; +import { ProfileEditEducationInfoService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-edit-education-info.service"; +import { ProfileDetailUIInfoService } from "projects/social_platform/src/app/api/profile/facades/detail/ui/profile-detail-ui-info.service"; + +@Component({ + selector: "app-profile-education-step", + templateUrl: "./profile-education-step.component.html", + styleUrl: "./profile-education-step.component.scss", + imports: [ + CommonModule, + IconComponent, + SelectComponent, + ButtonComponent, + InputComponent, + ReactiveFormsModule, + ControlErrorPipe, + ], + providers: [ProfileDetailUIInfoService], + standalone: true, +}) +export class ProfileEducationStepComponent { + @Input() isEducationDirty: any; + + protected readonly errorMessage = ErrorMessage; + + private readonly profileFormService = inject(ProfileFormService); + private readonly profileEditEducationInfoService = inject(ProfileEditEducationInfoService); + + protected readonly profileForm = this.profileFormService.getForm(); + protected readonly education = this.profileFormService.education; + protected readonly educationItems = this.profileEditEducationInfoService.educationItems; + + protected readonly yearListEducation = this.profileFormService.yearListEducation; + protected readonly educationLevelList = this.profileFormService.educationLevelList; + protected readonly educationStatusList = this.profileFormService.educationStatusList; + + protected readonly showEducationFields = this.profileEditEducationInfoService.showEducationFields; + protected readonly editEducationClick = this.profileEditEducationInfoService.editEducationClick; + + protected readonly selectedEntryYearEducationId = + this.profileEditEducationInfoService.selectedEntryYearEducationId; + + protected readonly selectedComplitionYearEducationId = + this.profileEditEducationInfoService.selectedComplitionYearEducationId; + + protected readonly selectedEducationLevelId = + this.profileEditEducationInfoService.selectedEducationLevelId; + + protected readonly selectedEducationStatusId = + this.profileEditEducationInfoService.selectedEducationStatusId; + + protected addEducation(): void { + this.profileEditEducationInfoService.addEducation(); + } + + protected editEducation(index: number): void { + this.profileEditEducationInfoService.editEducation(index); + } + + protected removeEducation(index: number): void { + this.profileEditEducationInfoService.removeEducation(index); + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.html b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.html new file mode 100644 index 00000000..2126a205 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.html @@ -0,0 +1,170 @@ + + +
    +
    + @if (showWorkFields()){ +
    +
    + @if (profileForm.get("entryYearWork"); as entryYearWork) { +
    + + + + + + @if (entryYearWork | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } @if (profileForm.get("completionYearWork"); as completionYearWork) { +
    + + + + + + @if (completionYearWork | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    +
    + +
    + @if (profileForm.get("organization"); as organization) { +
    + + + @if (organization | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("jobPosition"); as jobPosition) { +
    + + + @if (jobPosition | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (profileForm.get("descriptionWork"); as descriptionWork) { +
    + + + @if (descriptionWork | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + } + + + {{ editWorkClick() ? "сохранить изменения" : "добавить работу" }} + + +
    + +
    + @if(workItems().length || workExperience.length){ @for (workItem of workExperience.value; track + $index) { +
    +

    + {{ workItem.organizationName }} +

    + +

    + @if(workItem.entryYear && workItem.completionYear) { + {{ workItem.entryYear }} год • {{ workItem.completionYear }} год } @else if + (workItem.entryYear && !workItem.completionYear) { {{ workItem.entryYear }} год } @else if + (!workItem.entryYear && workItem.completionYear){ {{ workItem.completionYear }} год } +

    + +
    +
    +

    + {{ workItem.description }} +

    + +

    + {{ workItem.jobPosition }} +

    +
    + +
    +
    + +
    + +
    + +
    +
    +
    +
    + } } +
    +
    diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.scss b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.scss new file mode 100644 index 00000000..88a62014 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.scss @@ -0,0 +1,108 @@ +.profile__wrapper--education { + display: grid; + grid-template-columns: 6fr 4fr; + grid-gap: 20px; +} + +.profile__info--education { + display: flex; + flex-direction: column; + gap: 12px; +} + +.profile__education--list { + display: flex; + flex-direction: column; + gap: 20px; +} + +.profile__language--list { + display: grid; + grid-template-columns: 2fr 2fr; + grid-gap: 20px; +} + +.profile__education--card { + display: flex; + align-items: center; + justify-content: space-between; +} + +.profile__education--info { + display: flex; + flex-direction: column; + gap: 5px; + + :first-child { + color: var(--black); + } + + :last-child & app-file-item { + margin-top: 3px; + } +} + +.edit-icon, +.basket-icon { + width: 20px; + height: 20px; + padding: 6px; + cursor: pointer; + border-radius: 50%; +} + +.edit-icon { + border: 0.5px solid var(--accent); + + i { + color: var(--accent) !important; + } +} + +.basket-icon { + border: 0.5px solid var(--red); + + i { + color: var(--red) !important; + } +} + +.education { + &__title { + display: flex; + align-items: center; + justify-content: space-between; + padding-bottom: 5px; + border-bottom: 0.5px solid var(--medium-grey-for-outline); + } + + &__text { + color: var(--grey-for-text); + word-break: break-word; + overflow-wrap: anywhere; + white-space: wrap; + } +} + +.profile { + &__column { + display: flex; + flex-direction: column; + gap: 12px; + + &--date { + display: grid; + grid-template-columns: repeat(2, 3fr); + grid-gap: 20px; + } + } + + &__action { + &--icons { + display: flex; + flex-direction: column; + gap: 10px; + align-items: center; + } + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.ts b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.ts new file mode 100644 index 00000000..5d9c4476 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-experience-step/profile-experience-step.component.ts @@ -0,0 +1,65 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, Input, Output, EventEmitter } from "@angular/core"; +import { SelectComponent, InputComponent, ButtonComponent } from "@ui/components"; +import { TextareaComponent } from "@ui/components/textarea/textarea.component"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ProfileEditComponent } from "../../edit.component"; +import { ProfileFormService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-form.service"; +import { ControlErrorPipe } from "@corelib"; +import { ReactiveFormsModule } from "@angular/forms"; +import { ProfileEditExperienceInfoService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-edit-experience-info.service"; +import { IconComponent } from "@uilib"; + +@Component({ + selector: "app-profile-experience-step", + templateUrl: "./profile-experience-step.component.html", + styleUrl: "./profile-experience-step.component.scss", + imports: [ + CommonModule, + SelectComponent, + InputComponent, + IconComponent, + TextareaComponent, + ButtonComponent, + ControlErrorPipe, + ReactiveFormsModule, + ], + standalone: true, +}) +export class ProfileExperienceStepComponent { + @Input() isWorkDirty: any; + + private readonly profileFormService = inject(ProfileFormService); + private readonly profileEditExperienceInfoService = inject(ProfileEditExperienceInfoService); + + protected readonly profileForm = this.profileFormService.getForm(); + protected readonly workExperience = this.profileFormService.workExperience; + protected readonly workItems = this.profileEditExperienceInfoService.workItems; + + protected readonly yearListEducation = this.profileFormService.yearListEducation; + + protected readonly showWorkFields = this.profileEditExperienceInfoService.showWorkFields; + protected readonly editWorkClick = this.profileEditExperienceInfoService.editWorkClick; + + protected readonly selectedEntryYearWorkId = + this.profileEditExperienceInfoService.selectedEntryYearWorkId; + + protected readonly selectedComplitionYearWorkId = + this.profileEditExperienceInfoService.selectedComplitionYearWorkId; + + protected readonly errorMessage = ErrorMessage; + + addWork(): void { + this.profileEditExperienceInfoService.addWork(); + } + + editWork(index: number): void { + this.profileEditExperienceInfoService.editWork(index); + } + + removeWork(index: number): void { + this.profileEditExperienceInfoService.removeWork(index); + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.html b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.html new file mode 100644 index 00000000..fcc193cd --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.html @@ -0,0 +1,258 @@ + + +
    +
    + @if (avatar) { +
    + +
    + + @if (avatar | controlError: "required") { +
    + {{ errorMessage.EMPTY_AVATAR }} +
    + } +
    +
    + } @if (coverImageAddress) { +
    + + + + +

    + обложка формата +
    + .JPG или .JPEG весом до 50МБ +

    + @if (coverImageAddress | controlError: "required") { +

    загрузите файл

    + } +     +     +
    + } +
    + +
    +
    + @if (firstName) { +
    + + + @if (firstName | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } @if (lastName) { +
    + + + @if (lastName | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (city) { +
    + + + @if (city | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } @if (birthday) { +
    + + + @if (birthday | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    + @if (userType) { @if (userType.value !== 1) { +
    + + @if (roles(); as options) { + + } @if (userType | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } } @if (speciality) { +
    + +
    + +
    + @if (speciality | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    +
    + +
    + @if (aboutMe) { +
    + + + @if (aboutMe | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + +
    +
    +
    + +
    +
      + @for (control of links.controls; let i = $index; track i) { +
    • + + + + + +
      • + } +
    +
    +
    + + + добавить контакт + + +
    + +
    + @if (phoneNumber) { +
    + + + @if (phoneNumber | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    +
    +
    diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.scss b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.scss new file mode 100644 index 00000000..ed771891 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.scss @@ -0,0 +1,97 @@ +.profile__wrapper--main { + display: flex; + flex-direction: column; + gap: 12px; +} + +.profile__main--grid { + display: grid; + grid-template-columns: 3fr 3fr 4fr; + grid-gap: 20px; +} + +.profile__wrapper--links { + display: grid; + grid-template-columns: 7fr 3fr; + grid-gap: 20px; +} + +.profile { + &__row { + display: flex; + gap: 20px; + align-items: center; + width: 100%; + } + + &__file { + flex-grow: 1; + min-width: 0; + max-width: 333px; + + ::ng-deep { + app-upload-file { + height: 80px; + padding: 10px 30px; + } + } + } + + &__slides-title { + max-width: 320px; + margin-top: 12px; + color: var(--black); + text-align: center; + } + + &__slides-text { + max-width: 275px; + margin-top: 12px; + color: var(--black); + text-align: center; + opacity: 0.3; + + &:hover { + opacity: 1; + } + } + + &__slides-error { + margin-top: 12px; + color: var(--red); + } + + &__slides-open-file { + color: var(--accent); + transition: color 0.2s; + + &:hover { + color: var(--accent-dark); + } + } + + &__column { + display: flex; + flex-direction: column; + gap: 12px; + + &--date { + display: grid; + grid-template-columns: repeat(2, 3fr); + grid-gap: 20px; + } + } + + &__action { + &--icons { + display: flex; + flex-direction: column; + gap: 10px; + align-items: center; + } + } +} + +.error__phone-number { + margin-bottom: 10px; +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.ts b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.ts new file mode 100644 index 00000000..202b19f0 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-main-step/profile-main-step.component.ts @@ -0,0 +1,79 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, Input, Output, EventEmitter } from "@angular/core"; +import { InputComponent, ButtonComponent, SelectComponent } from "@ui/components"; +import { TextareaComponent } from "@ui/components/textarea/textarea.component"; +import { AutosizeModule } from "ngx-autosize"; +import { AutoCompleteInputComponent } from "@ui/components/autocomplete-input/autocomplete-input.component"; +import { UploadFileComponent } from "@ui/components/upload-file/upload-file.component"; +import { AvatarControlComponent } from "@ui/components/avatar-control/avatar-control.component"; +import { ControlErrorPipe } from "@corelib"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ProfileFormService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-form.service"; +import { ReactiveFormsModule } from "@angular/forms"; +import { SearchesService } from "projects/social_platform/src/app/api/searches/searches.service"; +import { IconComponent } from "@uilib"; + +@Component({ + selector: "app-profile-main-step", + templateUrl: "./profile-main-step.component.html", + styleUrl: "./profile-main-step.component.scss", + imports: [ + CommonModule, + IconComponent, + InputComponent, + ButtonComponent, + TextareaComponent, + AutosizeModule, + AutoCompleteInputComponent, + SelectComponent, + UploadFileComponent, + AvatarControlComponent, + ControlErrorPipe, + ReactiveFormsModule, + ], + standalone: true, +}) +export class ProfileMainStepComponent { + @Output() openSpecsGroupsModal = new EventEmitter(); + + private readonly profileFormService = inject(ProfileFormService); + private readonly searchesService = inject(SearchesService); + + protected readonly profileForm = this.profileFormService.getForm(); + + protected readonly avatar = this.profileFormService.avatar; + protected readonly coverImageAddress = this.profileFormService.coverImageAddress; + protected readonly firstName = this.profileFormService.firstName; + protected readonly lastName = this.profileFormService.lastName; + protected readonly city = this.profileFormService.city; + protected readonly birthday = this.profileFormService.birthday; + protected readonly userType = this.profileFormService.userType; + protected readonly speciality = this.profileFormService.speciality; + protected readonly aboutMe = this.profileFormService.aboutMe; + protected readonly phoneNumber = this.profileFormService.phoneNumber; + + protected readonly roles = this.profileFormService.roles; + protected readonly inlineSpecs = this.profileFormService.inlineSpecs; + + protected readonly links = this.profileFormService.links; + + protected readonly errorMessage = ErrorMessage; + + protected addLink(title?: string): void { + this.profileFormService.addLink(title); + } + + protected removeLink(index: number): void { + this.profileFormService.removeLink(index); + } + + protected onSearchSpec(query: string): void { + this.searchesService.onSearchSpec(query); + } + + protected toggleSpecsGroupsModal(): void { + this.openSpecsGroupsModal.emit(); + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.html b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.html new file mode 100644 index 00000000..f0940147 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.html @@ -0,0 +1,129 @@ + + +
    +
    +
    + +
    + +
    +
    + +
    + @if (profileForm.get("skills"); as skills) { +
    + +
    + } +
    +
    + +
    + @if (showLanguageFields()) { +
    + @if (profileForm.get("language"); as language) { +
    + + + + + + @if (language | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } @if (profileForm.get("languageLevel"); as languageLevel) { +
    + + + + + + @if (languageLevel | controlError: "required") { +
    + {{ errorMessage.VALIDATION_REQUIRED }} +
    + } +
    + } +
    + } + + количество добавляемых языков не более 4-х + + {{ editLanguageClick() ? "сохранить изменения" : "добавить язык" }} + + + +
    + @if(languageItems().length || userLanguages.length){ @for (languageItem of + userLanguages.value; track $index) { +
    +
    +

    + {{ languageItem.language }} +

    + +
    +
    + +
    + +
    + +
    +
    +
    + +

    + {{ languageItem.languageLevel }} +

    +
    + } } +
    +
    +
    diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.scss b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.scss new file mode 100644 index 00000000..1b7077ac --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.scss @@ -0,0 +1,114 @@ +.profile__main--grid { + display: grid; + grid-template-columns: 3fr 3fr 4fr; + grid-gap: 20px; +} + +.profile__wrapper--education { + display: grid; + grid-template-columns: 6fr 4fr; + grid-gap: 20px; +} + +.profile__info--education { + display: flex; + flex-direction: column; + gap: 12px; +} + +.profile__education--list { + display: flex; + flex-direction: column; + gap: 20px; +} + +.profile__language--list { + display: grid; + grid-template-columns: 2fr 2fr; + grid-gap: 20px; +} + +.profile__education--card { + display: flex; + align-items: center; + justify-content: space-between; +} + +.profile__education--info { + display: flex; + flex-direction: column; + gap: 5px; + + :first-child { + color: var(--black); + } + + :last-child & app-file-item { + margin-top: 3px; + } +} + +.edit-icon, +.basket-icon { + width: 20px; + height: 20px; + padding: 6px; + cursor: pointer; + border-radius: 50%; +} + +.edit-icon { + border: 0.5px solid var(--accent); + + i { + color: var(--accent) !important; + } +} + +.basket-icon { + border: 0.5px solid var(--red); + + i { + color: var(--red) !important; + } +} + +.education { + &__title { + display: flex; + align-items: center; + justify-content: space-between; + padding-bottom: 5px; + border-bottom: 0.5px solid var(--medium-grey-for-outline); + } + + &__text { + color: var(--grey-for-text); + word-break: break-word; + overflow-wrap: anywhere; + white-space: wrap; + } +} + +.profile { + &__column { + display: flex; + flex-direction: column; + gap: 12px; + + &--date { + display: grid; + grid-template-columns: repeat(2, 3fr); + grid-gap: 20px; + } + } + + &__action { + &--icons { + display: flex; + flex-direction: column; + gap: 10px; + align-items: center; + } + } +} diff --git a/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.ts b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.ts new file mode 100644 index 00000000..7fc51513 --- /dev/null +++ b/projects/social_platform/src/app/ui/pages/profile/edit/components/profile-skills-step/profile-skills-step.component.ts @@ -0,0 +1,96 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component, inject, Input, Output, EventEmitter } from "@angular/core"; +import { AutoCompleteInputComponent } from "@ui/components/autocomplete-input/autocomplete-input.component"; +import { SkillsBasketComponent } from "@ui/shared/skills-basket/skills-basket.component"; +import { SelectComponent, ButtonComponent } from "@ui/components"; +import { ReactiveFormsModule } from "@angular/forms"; +import { ControlErrorPipe } from "@corelib"; +import { ProfileFormService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-form.service"; +import { ErrorMessage } from "projects/core/src/lib/models/error/error-message"; +import { ProfileEditSkillsInfoService } from "projects/social_platform/src/app/api/profile/facades/edit/profile-edit-skills-info.service"; +import { Skill } from "projects/social_platform/src/app/domain/skills/skill"; +import { SkillsInfoService } from "projects/social_platform/src/app/api/skills/facades/skills-info.service"; +import { IconComponent } from "@uilib"; + +@Component({ + selector: "app-profile-skills-step", + templateUrl: "./profile-skills-step.component.html", + styleUrl: "./profile-skills-step.component.scss", + imports: [ + CommonModule, + AutoCompleteInputComponent, + SkillsBasketComponent, + SelectComponent, + ButtonComponent, + ReactiveFormsModule, + ControlErrorPipe, + IconComponent, + ], + standalone: true, +}) +export class ProfileSkillsStepComponent { + @Input() isLanguageDirty: any; + + @Output() openSkillsGroupsModal = new EventEmitter(); + + private readonly profileFormService = inject(ProfileFormService); + private readonly profileEditSkillsInfoService = inject(ProfileEditSkillsInfoService); + private readonly skillsInfoService = inject(SkillsInfoService); + + protected readonly profileForm = this.profileFormService.getForm(); + protected readonly languageItems = this.profileEditSkillsInfoService.languageItems; + protected readonly userLanguages = this.profileFormService.userLanguages; + + protected readonly languageList = this.profileFormService.languageList; + protected readonly languageLevelList = this.profileFormService.languageLevelList; + + protected readonly showLanguageFields = this.profileEditSkillsInfoService.showLanguageFields; + protected readonly editLanguageClick = this.profileEditSkillsInfoService.editLanguageClick; + + protected readonly selectedLanguageLevelId = + this.profileEditSkillsInfoService.selectedLanguageLevelId; + + protected readonly selectedLanguageId = this.profileEditSkillsInfoService.selectedLanguageId; + + protected readonly inlineSkills = this.skillsInfoService.inlineSkills; + + protected readonly errorMessage = ErrorMessage; + + protected addLanguage(): void { + this.profileEditSkillsInfoService.addLanguage(); + } + + protected editLanguage(index: number): void { + this.profileEditSkillsInfoService.editLanguage(index); + } + + protected removeLanguage(index: number): void { + this.profileEditSkillsInfoService.removeLanguage(index); + } + + /** + * Переключение навыка (добавление/удаление) + * @param toggledSkill - навык для переключения + */ + protected onToggleSkill(toggledSkill: Skill): void { + this.skillsInfoService.onToggleSkill(toggledSkill, this.profileForm); + } + + /** + * Добавление нового навыка + * @param newSkill - новый навык для добавления + */ + protected onAddSkill(newSkill: Skill): void { + this.skillsInfoService.onAddSkill(newSkill, this.profileForm); + } + + protected toggleSkillsGroupsModal(): void { + this.openSkillsGroupsModal.emit(); + } + + protected onSearchSkill(query: string): void { + this.skillsInfoService.onSearchSkill(query); + } +} From 61a744fe2def805ccbf49a16a6cd729e84b4066a Mon Sep 17 00:00:00 2001 From: Awakich Date: Tue, 20 Jan 2026 13:12:24 +0300 Subject: [PATCH 22/22] fix --- .../src/app/api/office/facades/ui/office-ui-info.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts b/projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts index 2e4e1829..c4a4ca8a 100644 --- a/projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts +++ b/projects/social_platform/src/app/api/office/facades/ui/office-ui-info.service.ts @@ -18,6 +18,7 @@ export class OfficeUIInfoService { applyVerificationModal(): void { // Не показываем модалку, если пользователь уже принял подтверждение if (localStorage.getItem("waitVerificationAccepted") === "true") { + // eslint-disable-next-line no-useless-return return; } }