Skip to content

Commit eb5f9c2

Browse files
committed
rewrite architecture to api, domain, ui
1 parent 727486c commit eb5f9c2

635 files changed

Lines changed: 881 additions & 941 deletions

File tree

Some content is hidden

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

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

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

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

55
/**
66
* Элементы навигации для редактирования проекта

projects/social_platform/src/app/auth/guards/auth-required.guard.spec.ts renamed to projects/core/src/lib/guards/auth/auth-required.guard.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { TestBed } from "@angular/core/testing";
44

55
import { AuthRequiredGuard } from "./auth-required.guard";
66
import { RouterTestingModule } from "@angular/router/testing";
7-
import { AuthService } from "../services";
87
import { of } from "rxjs";
98
import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router";
9+
import { AuthService } from "projects/social_platform/src/app/api/auth";
1010

1111
describe("AuthRequiredGuard", () => {
1212
beforeEach(() => {

projects/social_platform/src/app/auth/guards/auth-required.guard.ts renamed to projects/core/src/lib/guards/auth/auth-required.guard.ts

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

33
import { inject } from "@angular/core";
44
import { CanActivateFn, Router } from "@angular/router";
5-
import { AuthService } from "../services";
65
import { catchError, map } from "rxjs";
76
import { TokenService } from "@corelib";
7+
import { AuthService } from "projects/social_platform/src/app/api/auth";
88

99
/**
1010
* Guard для проверки аутентификации пользователя

projects/social_platform/src/app/office/projects/detail/kanban/kanban.guard.ts renamed to projects/core/src/lib/guards/kanban/kanban.guard.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import { inject } from "@angular/core";
44
import { ActivatedRouteSnapshot, CanActivateFn, Router, UrlTree } from "@angular/router";
5-
import { User } from "@auth/models/user.model";
6-
import { AuthService } from "@auth/services";
7-
import { Collaborator } from "@office/models/collaborator.model";
8-
import { ProjectService } from "@office/services/project.service";
5+
import { User } from "projects/social_platform/src/app/domain/auth/user.model";
6+
import { Collaborator } from "projects/social_platform/src/app/domain/project/collaborator.model";
7+
import { ProjectService } from "projects/social_platform/src/app/api/project/project.service";
98
import { catchError, map, Observable, of, switchMap } from "rxjs";
9+
import { AuthService } from "projects/social_platform/src/app/api/auth";
1010

1111
export const KanbanBoardGuard: CanActivateFn = (
1212
route: ActivatedRouteSnapshot

projects/social_platform/src/app/office/projects/edit/guards/projects-edit.guard.ts renamed to projects/core/src/lib/guards/projects-edit/projects-edit.guard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { inject } from "@angular/core";
44
import { ActivatedRouteSnapshot, CanActivateFn, Router, UrlTree } from "@angular/router";
55
import { Observable, of } from "rxjs";
66
import { catchError, map } from "rxjs/operators";
7-
import { ProjectService } from "@office/services/project.service";
7+
import { ProjectService } from "projects/social_platform/src/app/api/project/project.service";
88

99
export const ProjectEditRequiredGuard: CanActivateFn = (
1010
route: ActivatedRouteSnapshot

projects/core/src/lib/interceptors/bearer-token.interceptor.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import { TestBed } from "@angular/core/testing";
44

55
import { BearerTokenInterceptor } from "./bearer-token.interceptor";
6-
import { AuthService } from "@auth/services";
76
import { HttpClientTestingModule } from "@angular/common/http/testing";
87
import { RouterTestingModule } from "@angular/router/testing";
8+
import { AuthService } from "projects/social_platform/src/app/api/auth";
99

1010
describe("BearerTokenInterceptor", () => {
1111
beforeEach(() => {

projects/social_platform/src/app/error/models/error-code.ts renamed to projects/core/src/lib/models/error/error-code.ts

File renamed without changes.

projects/social_platform/src/app/error/models/error-message.ts renamed to projects/core/src/lib/models/error/error-message.ts

File renamed without changes.
File renamed without changes.

projects/core/src/lib/pipes/control-error.pipe.spec.ts renamed to projects/core/src/lib/pipes/controls/control-error.pipe.spec.ts

File renamed without changes.

0 commit comments

Comments
 (0)