diff --git a/src/app/chat/service/chats/chats.service.ts b/src/app/chat/service/chats/chats.service.ts index 811cd90f55..63b3e21190 100644 --- a/src/app/chat/service/chats/chats.service.ts +++ b/src/app/chat/service/chats/chats.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Chat, ChatDto, LocationForChat } from '../../model/Chat.model'; -import { environment } from '../../../../environments/environment'; +import { environment } from 'src/environments/environment'; import { BehaviorSubject, Observable, Subject } from 'rxjs'; import { Message, MessageExtended, MessagesToSave } from '../../model/Message.model'; import { FriendArrayModel, FriendModel } from '@global-user/models/friend.model'; diff --git a/src/app/main/component/about/components/about-page/about-page.component.spec.ts b/src/app/main/component/about/components/about-page/about-page.component.spec.ts index ac0e604c00..3e1e471bf0 100644 --- a/src/app/main/component/about/components/about-page/about-page.component.spec.ts +++ b/src/app/main/component/about/components/about-page/about-page.component.spec.ts @@ -1,4 +1,4 @@ -import { Language } from './../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CUSTOM_ELEMENTS_SCHEMA, Injectable, EventEmitter } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core'; diff --git a/src/app/main/component/auth/components/auth-modal/auth-modal.component.ts b/src/app/main/component/auth/components/auth-modal/auth-modal.component.ts index c3ad73e30d..840f3bdcc3 100644 --- a/src/app/main/component/auth/components/auth-modal/auth-modal.component.ts +++ b/src/app/main/component/auth/components/auth-modal/auth-modal.component.ts @@ -1,4 +1,4 @@ -import { authImages, ubsAuthImages } from './../../../../image-pathes/auth-images'; +import { authImages, ubsAuthImages } from 'src/app/main/image-pathes/auth-images'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { LiveAnnouncer } from '@angular/cdk/a11y'; diff --git a/src/app/main/component/auth/components/confirm-restore-password/confirm-restore-password.component.ts b/src/app/main/component/auth/components/confirm-restore-password/confirm-restore-password.component.ts index a4d11017e1..cacf26d289 100644 --- a/src/app/main/component/auth/components/confirm-restore-password/confirm-restore-password.component.ts +++ b/src/app/main/component/auth/components/confirm-restore-password/confirm-restore-password.component.ts @@ -1,6 +1,6 @@ -import { SignInIcons } from './../../../../image-pathes/sign-in-icons'; -import { RestoreDto } from './../../../../model/restroreDto'; -import { authImages, ubsAuthImages } from './../../../../image-pathes/auth-images'; +import { SignInIcons } from 'src/app/main/image-pathes/sign-in-icons'; +import { RestoreDto } from 'src/app/main/model/restroreDto'; +import { authImages, ubsAuthImages } from 'src/app/main/image-pathes/auth-images'; import { Component, OnInit } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; import { AbstractControl, FormGroup, FormControl, FormBuilder } from '@angular/forms'; diff --git a/src/app/main/component/auth/components/google-btn/google-btn.component.ts b/src/app/main/component/auth/components/google-btn/google-btn.component.ts index 26efdddd77..8863eba222 100644 --- a/src/app/main/component/auth/components/google-btn/google-btn.component.ts +++ b/src/app/main/component/auth/components/google-btn/google-btn.component.ts @@ -1,4 +1,4 @@ -import { SignInIcons } from './../../../../image-pathes/sign-in-icons'; +import { SignInIcons } from 'src/app/main/image-pathes/sign-in-icons'; import { Component, Input } from '@angular/core'; @Component({ diff --git a/src/app/main/component/auth/components/restore-password/restore-password.component.spec.ts b/src/app/main/component/auth/components/restore-password/restore-password.component.spec.ts index 3c6f8bdb13..735d5f48c2 100644 --- a/src/app/main/component/auth/components/restore-password/restore-password.component.spec.ts +++ b/src/app/main/component/auth/components/restore-password/restore-password.component.spec.ts @@ -1,4 +1,4 @@ -import { UserSuccessSignIn } from './../../../../model/user-success-sign-in'; +import { UserSuccessSignIn } from 'src/app/main/model/user-success-sign-in'; import { RestorePasswordComponent } from './restore-password.component'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; diff --git a/src/app/main/component/auth/components/restore-password/restore-password.component.ts b/src/app/main/component/auth/components/restore-password/restore-password.component.ts index cbe1d4d1b4..aaff9e1ceb 100644 --- a/src/app/main/component/auth/components/restore-password/restore-password.component.ts +++ b/src/app/main/component/auth/components/restore-password/restore-password.component.ts @@ -1,6 +1,6 @@ -import { UserOwnSignIn } from './../../../../model/user-own-sign-in'; -import { UserSuccessSignIn } from './../../../../model/user-success-sign-in'; -import { SignInIcons } from './../../../../image-pathes/sign-in-icons'; +import { UserOwnSignIn } from 'src/app/main/model/user-own-sign-in'; +import { UserSuccessSignIn } from 'src/app/main/model/user-success-sign-in'; +import { SignInIcons } from 'src/app/main/image-pathes/sign-in-icons'; import { Component, EventEmitter, OnInit, OnDestroy, Output, OnChanges, Input } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { AbstractControl, FormGroup, FormControl, Validators } from '@angular/forms'; diff --git a/src/app/main/component/auth/components/restore/restore.component.spec.ts b/src/app/main/component/auth/components/restore/restore.component.spec.ts index b6f8ddd1ca..1adeca6239 100644 --- a/src/app/main/component/auth/components/restore/restore.component.spec.ts +++ b/src/app/main/component/auth/components/restore/restore.component.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { RestorePasswordService } from '../../../../service/auth/restore-password.service'; -import { Language } from './../../../../i18n/Language'; -import { LocalStorageService } from '../../../../service/localstorage/local-storage.service'; +import { RestorePasswordService } from 'src/app/main/service/auth/restore-password.service'; +import { Language } from 'src/app/main/i18n/Language'; +import { LocalStorageService } from 'src/app/main/service/localstorage/local-storage.service'; import { ComponentFixture, TestBed, inject, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { MatDialogModule, MatDialogRef } from '@angular/material/dialog'; diff --git a/src/app/main/component/auth/components/restore/restore.component.ts b/src/app/main/component/auth/components/restore/restore.component.ts index e58dd308a9..b7822ce11a 100644 --- a/src/app/main/component/auth/components/restore/restore.component.ts +++ b/src/app/main/component/auth/components/restore/restore.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { RestorePasswordService } from '../../../../service/auth/restore-password.service'; +import { RestorePasswordService } from 'src/app/main/service/auth/restore-password.service'; @Component({ selector: 'app-restore', diff --git a/src/app/main/component/auth/components/sign-in/sign-in.component.ts b/src/app/main/component/auth/components/sign-in/sign-in.component.ts index 3ed66a20ff..328024cdd1 100644 --- a/src/app/main/component/auth/components/sign-in/sign-in.component.ts +++ b/src/app/main/component/auth/components/sign-in/sign-in.component.ts @@ -8,7 +8,7 @@ import { accounts } from 'google-one-tap'; import { Observable, Subject } from 'rxjs'; import { take } from 'rxjs/operators'; import { Patterns } from 'src/assets/patterns/patterns'; -import { SignInIcons } from './../../../../image-pathes/sign-in-icons'; +import { SignInIcons } from 'src/app/main/image-pathes/sign-in-icons'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; diff --git a/src/app/main/component/auth/components/sign-up/sign-up.component.spec.ts b/src/app/main/component/auth/components/sign-up/sign-up.component.spec.ts index 921723b689..0cbeb5f5c5 100644 --- a/src/app/main/component/auth/components/sign-up/sign-up.component.spec.ts +++ b/src/app/main/component/auth/components/sign-up/sign-up.component.spec.ts @@ -1,4 +1,4 @@ -import { Language } from '../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { UserOwnSignUp } from '@global-models/user-own-sign-up'; import { UserSuccessSignIn } from '@global-models/user-success-sign-in'; import { ComponentFixture, TestBed, fakeAsync, flush, waitForAsync } from '@angular/core/testing'; diff --git a/src/app/main/component/auth/components/sign-up/sign-up.component.ts b/src/app/main/component/auth/components/sign-up/sign-up.component.ts index a1be0ba516..020f9d2ce9 100644 --- a/src/app/main/component/auth/components/sign-up/sign-up.component.ts +++ b/src/app/main/component/auth/components/sign-up/sign-up.component.ts @@ -1,7 +1,7 @@ -import { Patterns } from './../../../../../../assets/patterns/patterns'; -import { UserSuccessSignIn, SuccessSignUpDto } from './../../../../model/user-success-sign-in'; -import { UserOwnSignUp } from './../../../../model/user-own-sign-up'; -import { authImages } from './../../../../image-pathes/auth-images'; +import { Patterns } from 'src/assets/patterns/patterns'; +import { UserSuccessSignIn, SuccessSignUpDto } from 'src/app/main/model/user-success-sign-in'; +import { UserOwnSignUp } from 'src/app/main/model/user-own-sign-up'; +import { authImages } from 'src/app/main/image-pathes/auth-images'; import { Component, EventEmitter, OnInit, OnDestroy, Output, OnChanges, Input } from '@angular/core'; import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; diff --git a/src/app/main/component/core/core.module.ts b/src/app/main/component/core/core.module.ts index 4734823d5c..9441d9a017 100644 --- a/src/app/main/component/core/core.module.ts +++ b/src/app/main/component/core/core.module.ts @@ -1,4 +1,4 @@ -import { AppRoutingModule } from './../../../app-routing.module'; +import { AppRoutingModule } from 'src/app/app-routing.module'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/main/component/eco-news/components/create-edit-news/create-edit-news.component.spec.ts b/src/app/main/component/eco-news/components/create-edit-news/create-edit-news.component.spec.ts index 0b75657088..e11f3c4fe7 100644 --- a/src/app/main/component/eco-news/components/create-edit-news/create-edit-news.component.spec.ts +++ b/src/app/main/component/eco-news/components/create-edit-news/create-edit-news.component.spec.ts @@ -24,18 +24,18 @@ import { ACTION_CONFIG, ACTION_TOKEN } from './action.constants'; import { CreateEditNewsFormBuilder } from './create-edit-news-form-builder'; import { HomepageComponent } from 'src/app/main/component/home/components'; import { SearchAllResultsComponent } from 'src/app/main/component/layout/components'; -import { MainComponent } from '../../../../main.component'; -import { UbsBaseSidebarComponent } from '../../../../../shared/ubs-base-sidebar/ubs-base-sidebar.component'; +import { MainComponent } from 'src/app/main/main.component'; +import { UbsBaseSidebarComponent } from 'src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component'; import { Store, ActionsSubject } from '@ngrx/store'; import { QuillModule } from 'ngx-quill'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { Language } from '../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FilterModel } from '@shared/components/tag-filter/tag-filter.model'; import { LanguageService } from 'src/app/main/i18n/language.service'; import { FIRSTECONEWS } from '../../mocks/eco-news-mock'; import { NewsDTO } from '@eco-news-models/create-news-interface'; -import { CreateEcoNewsAction } from '../../../../../store/actions/ecoNews.actions'; +import { CreateEcoNewsAction } from 'src/app/store/actions/ecoNews.actions'; function getEmptyFormGroup() { return new FormGroup({ diff --git a/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.spec.ts b/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.spec.ts index 96dcb92b80..eb88acd6f7 100644 --- a/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.spec.ts +++ b/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.spec.ts @@ -13,11 +13,11 @@ import { Store } from '@ngrx/store'; import { BehaviorSubject, of } from 'rxjs'; import { SafeHtmlPipe } from '@pipe/safe-html-pipe/safe-html.pipe'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; -import { Language } from '../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { LanguageService } from 'src/app/main/i18n/language.service'; import { FIRSTECONEWS } from '../../mocks/eco-news-mock'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; -import { singleNewsImages } from '../../../../image-pathes/single-news-images'; +import { singleNewsImages } from 'src/app/main/image-pathes/single-news-images'; import { MatSnackBarComponent } from '@global-errors/mat-snack-bar/mat-snack-bar.component'; import { MetaService } from 'src/app/shared/services/meta/meta.service'; diff --git a/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.ts b/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.ts index 53080c9b7d..6a6e1e4789 100644 --- a/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.ts +++ b/src/app/main/component/eco-news/components/eco-news-detail/eco-news-detail.component.ts @@ -1,4 +1,4 @@ -import { singleNewsImages } from '../../../../image-pathes/single-news-images'; +import { singleNewsImages } from 'src/app/main/image-pathes/single-news-images'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Subject } from 'rxjs'; diff --git a/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.spec.ts b/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.spec.ts index 98f31c53a7..2c34645cfc 100644 --- a/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.spec.ts +++ b/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.spec.ts @@ -4,10 +4,10 @@ import { TranslateModule } from '@ngx-translate/core'; import { NewsListListViewComponent } from './news-list-list-view.component'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { Language } from '../../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { BehaviorSubject } from 'rxjs'; import { LanguageService } from 'src/app/main/i18n/language.service'; -import { FIRSTECONEWS } from '../../../mocks/eco-news-mock'; +import { FIRSTECONEWS } from 'src/app/main/component/eco-news/mocks/eco-news-mock'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.ts b/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.ts index 4d0eddd0a0..9ab5ddca1e 100644 --- a/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.ts +++ b/src/app/main/component/eco-news/components/news-list/news-list-list-view/news-list-list-view.component.ts @@ -1,4 +1,4 @@ -import { userAssignedCardsIcons } from '../../../../../image-pathes/profile-icons'; +import { userAssignedCardsIcons } from 'src/app/main/image-pathes/profile-icons'; import { Component, Input, diff --git a/src/app/main/component/eco-news/components/news-list/news-list.component.spec.ts b/src/app/main/component/eco-news/components/news-list/news-list.component.spec.ts index c8818f6255..845bf3fe47 100644 --- a/src/app/main/component/eco-news/components/news-list/news-list.component.spec.ts +++ b/src/app/main/component/eco-news/components/news-list/news-list.component.spec.ts @@ -17,7 +17,7 @@ import { SharedModule } from 'src/app/shared/shared.module'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { Store } from '@ngrx/store'; -import { Language } from '../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { MatDialog } from '@angular/material/dialog'; import { ChangeEcoNewsFavoriteStatusAction } from 'src/app/store/actions/ecoNews.actions'; diff --git a/src/app/main/component/eco-news/components/news-list/news-list.component.ts b/src/app/main/component/eco-news/components/news-list/news-list.component.ts index 81f86fda66..b488a2190b 100644 --- a/src/app/main/component/eco-news/components/news-list/news-list.component.ts +++ b/src/app/main/component/eco-news/components/news-list/news-list.component.ts @@ -1,4 +1,4 @@ -import { Breakpoints } from '../../../../config/breakpoints.constants'; +import { Breakpoints } from 'src/app/main/config/breakpoints.constants'; import { Component, OnInit, OnDestroy } from '@angular/core'; import { Observable, of, ReplaySubject } from 'rxjs'; import { map, take, takeUntil } from 'rxjs/operators'; diff --git a/src/app/main/component/eco-news/components/news-preview-page/news-preview-page.component.ts b/src/app/main/component/eco-news/components/news-preview-page/news-preview-page.component.ts index 83877ae9f0..5035bc9e45 100644 --- a/src/app/main/component/eco-news/components/news-preview-page/news-preview-page.component.ts +++ b/src/app/main/component/eco-news/components/news-preview-page/news-preview-page.component.ts @@ -1,4 +1,4 @@ -import { singleNewsImages } from '../../../../image-pathes/single-news-images'; +import { singleNewsImages } from 'src/app/main/image-pathes/single-news-images'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { CreateEcoNewsService } from '@eco-news-service/create-eco-news.service'; import { Router } from '@angular/router'; diff --git a/src/app/main/component/eco-news/eco-news.component.spec.ts b/src/app/main/component/eco-news/eco-news.component.spec.ts index 24aeb272af..7fb72dc63a 100644 --- a/src/app/main/component/eco-news/eco-news.component.spec.ts +++ b/src/app/main/component/eco-news/eco-news.component.spec.ts @@ -1,4 +1,4 @@ -import { Language } from './../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { RouterTestingModule } from '@angular/router/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; diff --git a/src/app/main/component/events/components/event-editor/components/create-event-dates/components/date-time/date-time.component.ts b/src/app/main/component/events/components/event-editor/components/create-event-dates/components/date-time/date-time.component.ts index 2c4f4d5200..5746b62b8b 100644 --- a/src/app/main/component/events/components/event-editor/components/create-event-dates/components/date-time/date-time.component.ts +++ b/src/app/main/component/events/components/event-editor/components/create-event-dates/components/date-time/date-time.component.ts @@ -4,7 +4,7 @@ import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/materia import { IMask } from 'angular-imask'; import * as _moment from 'moment'; import 'moment/locale/uk'; -import { LanguageService } from '../../../../../../../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { MomentDateAdapter } from './moment-date-adapter'; export const MY_FORMATS = { diff --git a/src/app/main/component/events/components/event-editor/components/create-event-dates/components/place-online/place-online.component.ts b/src/app/main/component/events/components/event-editor/components/create-event-dates/components/place-online/place-online.component.ts index ea9bc3f273..87ec1fe210 100644 --- a/src/app/main/component/events/components/event-editor/components/create-event-dates/components/place-online/place-online.component.ts +++ b/src/app/main/component/events/components/event-editor/components/create-event-dates/components/place-online/place-online.component.ts @@ -5,7 +5,7 @@ import { GoogleScript } from '@assets/google-script/google-script'; import { Patterns } from '@assets/patterns/patterns'; import { GeocoderService } from '@global-service/geocoder/geocoder.service'; import { Subject, takeUntil } from 'rxjs'; -import { PlaceOnlineGroup } from '../../../../../../models/events.interface'; +import { PlaceOnlineGroup } from 'src/app/main/component/events/models/events.interface'; @Component({ selector: 'app-place-online', diff --git a/src/app/main/component/events/components/event-editor/components/create-event-dates/create-event-dates.component.spec.ts b/src/app/main/component/events/components/event-editor/components/create-event-dates/create-event-dates.component.spec.ts index 2da4ef51b5..cf71a0b803 100644 --- a/src/app/main/component/events/components/event-editor/components/create-event-dates/create-event-dates.component.spec.ts +++ b/src/app/main/component/events/components/event-editor/components/create-event-dates/create-event-dates.component.spec.ts @@ -12,7 +12,7 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MatInputModule } from '@angular/material/input'; -import { DefaultCoordinates } from '../../../../models/event-consts'; +import { DefaultCoordinates } from 'src/app/main/component/events/models/event-consts'; describe('CreateEventDatesComponent', () => { let component: CreateEventDatesComponent; diff --git a/src/app/main/component/events/components/event-editor/components/create-event-information/components/images-container/images-container.component.ts b/src/app/main/component/events/components/event-editor/components/create-event-information/components/images-container/images-container.component.ts index 99c096fe3b..56a2025594 100644 --- a/src/app/main/component/events/components/event-editor/components/create-event-information/components/images-container/images-container.component.ts +++ b/src/app/main/component/events/components/event-editor/components/create-event-information/components/images-container/images-container.component.ts @@ -1,8 +1,8 @@ import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { MatSnackBarComponent } from '@global-errors/mat-snack-bar/mat-snack-bar.component'; -import { FileHandle } from '../../../../../../../../../ubs/ubs-admin/models/file-handle.model'; -import { EventsService } from '../../../../../../services/events.service'; -import { ImagesContainer } from '../../../../../../models/events.interface'; +import { FileHandle } from 'src/app/ubs/ubs-admin/models/file-handle.model'; +import { EventsService } from 'src/app/main/component/events/services/events.service'; +import { ImagesContainer } from 'src/app/main/component/events/models/events.interface'; import { MatDialog } from '@angular/material/dialog'; import { EditImagePopUpComponent } from 'src/app/shared/edit-image-pop-up/edit-image-pop-up.component'; import { take } from 'rxjs'; diff --git a/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.spec.ts b/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.spec.ts index 0b3e5ba4ce..8ca7484f7b 100644 --- a/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.spec.ts +++ b/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.spec.ts @@ -11,7 +11,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; import { TranslateModule } from '@ngx-translate/core'; import { ContentChange, QuillModule } from 'ngx-quill'; -import { Language } from '../../../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { CreateEventInformationComponent } from './create-event-information.component'; describe('CreateEventInformationComponent', () => { diff --git a/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.ts b/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.ts index 0cc7a1ac0a..1099a35b8c 100644 --- a/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.ts +++ b/src/app/main/component/events/components/event-editor/components/create-event-information/create-event-information.component.ts @@ -4,8 +4,8 @@ import { ContentChange } from 'ngx-quill'; import { FormGroup } from '@angular/forms'; import { quillConfig } from '../../quillEditorFunc'; -import { EVENT_LOCALE, EventLocaleKeys } from '../../../../models/event-consts'; -import { ImagesContainer } from '../../../../models/events.interface'; +import { EVENT_LOCALE, EventLocaleKeys } from 'src/app/main/component/events/models/event-consts'; +import { ImagesContainer } from 'src/app/main/component/events/models/events.interface'; import { Router } from '@angular/router'; @Component({ diff --git a/src/app/main/component/events/components/event-editor/event-editor.component.ts b/src/app/main/component/events/components/event-editor/event-editor.component.ts index 03b61d5a8c..d0feca0818 100644 --- a/src/app/main/component/events/components/event-editor/event-editor.component.ts +++ b/src/app/main/component/events/components/event-editor/event-editor.component.ts @@ -14,7 +14,7 @@ import { Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; import { DialogPopUpComponent } from 'src/app/shared/dialog-pop-up/dialog-pop-up.component'; import { CreateEcoEventAction, EditEcoEventAction, EventsActions } from 'src/app/store/actions/ecoEvents.actions'; -import { singleNewsImages } from '../../../../image-pathes/single-news-images'; +import { singleNewsImages } from 'src/app/main/image-pathes/single-news-images'; import { Place } from '../../../places/models/place'; import { DefaultCoordinates } from '../../models/event-consts'; import { DateInformation, Dates, EventDTO, EventForm, EventResponse, TagObj } from '../../models/events.interface'; @@ -230,7 +230,8 @@ export class EventEditorComponent extends FormBaseComponent implements OnInit { this.eventId = Number(urlSegments[urlSegments.length - 1]); } const currentImages = (this._savedFormValues?.eventInformation?.images || []) - .filter((value) => !value.file).map((value) => value.url); + .filter((value) => !value.file) + .map((value) => value.url); sendEventDto = { ...sendEventDto, additionalImages: currentImages.slice(1), @@ -258,42 +259,44 @@ export class EventEditorComponent extends FormBaseComponent implements OnInit { } transformDatesFormToDates(form: DateInformation[]): Dates[] { - return form.map((value) => { - const { date, endTime, startTime } = value.day; - const { onlineLink, place, coordinates } = value.placeOnline; + return form + .map((value) => { + const { date, endTime, startTime } = value.day; + const { onlineLink, place, coordinates } = value.placeOnline; - const dateObject = new Date(date); + const dateObject = new Date(date); - if (isNaN(dateObject.getTime())) { - return; - } + if (isNaN(dateObject.getTime())) { + return; + } - let [hours, minutes] = startTime.split(':'); - dateObject.setHours(parseInt(hours, 10)); - dateObject.setMinutes(parseInt(minutes, 10)); - const startDate = dateObject.toISOString(); + let [hours, minutes] = startTime.split(':'); + dateObject.setHours(parseInt(hours, 10)); + dateObject.setMinutes(parseInt(minutes, 10)); + const startDate = dateObject.toISOString(); - [hours, minutes] = endTime.split(':'); - dateObject.setHours(parseInt(hours, 10)); - dateObject.setMinutes(parseInt(minutes, 10)); - const finishDate = dateObject.toISOString(); + [hours, minutes] = endTime.split(':'); + dateObject.setHours(parseInt(hours, 10)); + dateObject.setMinutes(parseInt(minutes, 10)); + const finishDate = dateObject.toISOString(); - const dates: Dates = { - startDate, - finishDate, - id: undefined - }; - if (onlineLink) { - dates.onlineLink = onlineLink; - } - if (place) { - dates.coordinates = { - latitude: coordinates.lat, - longitude: coordinates.lng + const dates: Dates = { + startDate, + finishDate, + id: undefined }; - } - return dates; - }).filter(Boolean); + if (onlineLink) { + dates.onlineLink = onlineLink; + } + if (place) { + dates.coordinates = { + latitude: coordinates.lat, + longitude: coordinates.lng + }; + } + return dates; + }) + .filter(Boolean); } escapeFromCreateEvent(): void { diff --git a/src/app/main/component/events/components/update-event/update-event.component.spec.ts b/src/app/main/component/events/components/update-event/update-event.component.spec.ts index c63ba55a7b..bc2a8feba6 100644 --- a/src/app/main/component/events/components/update-event/update-event.component.spec.ts +++ b/src/app/main/component/events/components/update-event/update-event.component.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { UpdateEventComponent } from './update-event.component'; -import { EventStoreService } from '../../services/event-store.service'; +import { EventStoreService } from 'src/app/main/component/events/services/event-store.service'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { SharedModule } from '../../../../../shared/shared.module'; +import { SharedModule } from 'src/app/shared/shared.module'; describe('UpdateEventComponent', () => { let component: UpdateEventComponent; diff --git a/src/app/main/component/events/components/update-event/update-event.component.ts b/src/app/main/component/events/components/update-event/update-event.component.ts index 364410d381..12b0440e79 100644 --- a/src/app/main/component/events/components/update-event/update-event.component.ts +++ b/src/app/main/component/events/components/update-event/update-event.component.ts @@ -9,7 +9,7 @@ import { EventResponse, ImagesContainer } from '../../models/events.interface'; -import { LanguageService } from '../../../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { EventStoreService } from '../../services/event-store.service'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; diff --git a/src/app/main/component/events/events.component.spec.ts b/src/app/main/component/events/events.component.spec.ts index 5e836b6c47..7fd8ff79c3 100644 --- a/src/app/main/component/events/events.component.spec.ts +++ b/src/app/main/component/events/events.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { EventsComponent } from './events.component'; import { TranslateService } from '@ngx-translate/core'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { Language } from '../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { RouterTestingModule } from '@angular/router/testing'; import { BehaviorSubject } from 'rxjs'; diff --git a/src/app/main/component/events/services/events.effects.spec.ts b/src/app/main/component/events/services/events.effects.spec.ts index 487b53e111..d442b05f89 100644 --- a/src/app/main/component/events/services/events.effects.spec.ts +++ b/src/app/main/component/events/services/events.effects.spec.ts @@ -3,7 +3,7 @@ import { EventsService } from 'src/app/main/component/events/services/events.ser import { of, throwError } from 'rxjs'; import { mockFavouriteEvents } from '@assets/mocks/events/mock-events'; import { Actions } from '@ngrx/effects'; -import { EventsEffects } from '../../../../store/effects/ecoEvents.effects'; +import { EventsEffects } from 'src/app/store/effects/ecoEvents.effects'; import { AddAttenderEcoEventsByIdAction, AddAttenderEventsByIdSuccessAction, @@ -18,7 +18,7 @@ import { ReceivedFailureAction, RemoveAttenderEcoEventsByIdAction, RemoveAttenderEventsByIdSuccessAction -} from '../../../../store/actions/ecoEvents.actions'; +} from 'src/app/store/actions/ecoEvents.actions'; import { StoreModule } from '@ngrx/store'; describe('EventsService', () => { diff --git a/src/app/main/component/home/components/homepage/homepage.component.spec.ts b/src/app/main/component/home/components/homepage/homepage.component.spec.ts index 41aded6a89..f779f008d8 100644 --- a/src/app/main/component/home/components/homepage/homepage.component.spec.ts +++ b/src/app/main/component/home/components/homepage/homepage.component.spec.ts @@ -1,4 +1,4 @@ -import { Language } from '../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { LayoutModule } from '../../../layout/layout.module'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; diff --git a/src/app/main/component/home/components/homepage/homepage.component.ts b/src/app/main/component/home/components/homepage/homepage.component.ts index bd4d31256e..ae9096c176 100644 --- a/src/app/main/component/home/components/homepage/homepage.component.ts +++ b/src/app/main/component/home/components/homepage/homepage.component.ts @@ -1,4 +1,4 @@ -import { CheckTokenService } from './../../../../service/auth/check-token/check-token.service'; +import { CheckTokenService } from 'src/app/main/service/auth/check-token/check-token.service'; import { Component, OnInit, OnDestroy } from '@angular/core'; import { Router } from '@angular/router'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; diff --git a/src/app/main/component/home/components/stat-rows/stat-rows.component.spec.ts b/src/app/main/component/home/components/stat-rows/stat-rows.component.spec.ts index 4cabe86971..45ec5fec2f 100644 --- a/src/app/main/component/home/components/stat-rows/stat-rows.component.spec.ts +++ b/src/app/main/component/home/components/stat-rows/stat-rows.component.spec.ts @@ -1,4 +1,4 @@ -import { HabitItemsAmountStatisticDto } from './../../../../model/goal/HabitItemsAmountStatisticDto'; +import { HabitItemsAmountStatisticDto } from 'src/app/main/model/goal/HabitItemsAmountStatisticDto'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { UserService } from '@global-service/user/user.service'; diff --git a/src/app/main/component/home/components/stat-rows/stat-rows.component.ts b/src/app/main/component/home/components/stat-rows/stat-rows.component.ts index 6fa9ce35e4..e89b0800d8 100644 --- a/src/app/main/component/home/components/stat-rows/stat-rows.component.ts +++ b/src/app/main/component/home/components/stat-rows/stat-rows.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { UserService } from '../../../../service/user/user.service'; +import { UserService } from 'src/app/main/service/user/user.service'; @Component({ selector: 'app-stat-rows', diff --git a/src/app/main/component/home/components/unsubscribe/unsubscribe.component.ts b/src/app/main/component/home/components/unsubscribe/unsubscribe.component.ts index 0df73a375e..f9723571ef 100644 --- a/src/app/main/component/home/components/unsubscribe/unsubscribe.component.ts +++ b/src/app/main/component/home/components/unsubscribe/unsubscribe.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { SubscriptionService } from '@global-service/subscription/subscription.service'; import { take } from 'rxjs'; -import { footerIcons } from './../../../../image-pathes/footer-icons'; +import { footerIcons } from 'src/app/main/image-pathes/footer-icons'; @Component({ selector: 'app-unsubscribe', diff --git a/src/app/main/component/layout/components/footer/footer.component.ts b/src/app/main/component/layout/components/footer/footer.component.ts index 4c9ea64171..fafa158719 100644 --- a/src/app/main/component/layout/components/footer/footer.component.ts +++ b/src/app/main/component/layout/components/footer/footer.component.ts @@ -1,4 +1,4 @@ -import { footerIcons } from './../../../../image-pathes/footer-icons'; +import { footerIcons } from 'src/app/main/image-pathes/footer-icons'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; import { Component, OnInit, OnDestroy } from '@angular/core'; diff --git a/src/app/main/component/layout/components/index.ts b/src/app/main/component/layout/components/index.ts index e228ac157f..1167b02ef6 100644 --- a/src/app/main/component/layout/components/index.ts +++ b/src/app/main/component/layout/components/index.ts @@ -1,6 +1,6 @@ export { FooterComponent } from './footer/footer.component'; -export { HeaderComponent } from '../../../../shared/header/header.component'; -export { SearchPopupComponent } from '../../../../shared/search-popup/search-popup.component'; -export { SearchItemComponent } from '../../../../shared/search-item/search-item.component'; -export { SearchNotFoundComponent } from '../../../../shared/search-not-found/search-not-found.component'; -export { SearchAllResultsComponent } from '../../../../shared/search-all-results/search-all-results.component'; +export { HeaderComponent } from 'src/app/shared/header/header.component'; +export { SearchPopupComponent } from 'src/app/shared/search-popup/search-popup.component'; +export { SearchItemComponent } from 'src/app/shared/search-item/search-item.component'; +export { SearchNotFoundComponent } from 'src/app/shared/search-not-found/search-not-found.component'; +export { SearchAllResultsComponent } from 'src/app/shared/search-all-results/search-all-results.component'; diff --git a/src/app/main/component/places/components/address-input/address-input.component.spec.ts b/src/app/main/component/places/components/address-input/address-input.component.spec.ts index 5222631666..df36888ddd 100644 --- a/src/app/main/component/places/components/address-input/address-input.component.spec.ts +++ b/src/app/main/component/places/components/address-input/address-input.component.spec.ts @@ -4,7 +4,7 @@ import { AddressInputComponent } from './address-input.component'; import { TranslateModule } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { Language } from '../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; describe('AddressInputComponent', () => { let component: AddressInputComponent; diff --git a/src/app/main/component/places/places.component.ts b/src/app/main/component/places/places.component.ts index 6030a84f8c..262710458f 100644 --- a/src/app/main/component/places/places.component.ts +++ b/src/app/main/component/places/places.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; import { MatDrawer } from '@angular/material/sidenav'; import { PlaceService } from '@global-service/place/place.service'; -import { greenIcon, notification, redIcon, searchIcon, share, star, starHalf, starUnfilled } from '../../image-pathes/places-icons'; +import { greenIcon, notification, redIcon, searchIcon, share, star, starHalf, starUnfilled } from 'src/app/main/image-pathes/places-icons'; import { AllAboutPlace, Place } from './models/place'; import { FilterPlaceService } from '@global-service/filtering/filter-place.service'; import { debounceTime, take, takeUntil } from 'rxjs/operators'; diff --git a/src/app/main/component/shared/components/events-list-item/events-list-item-modal/events-list-item-modal.component.spec.ts b/src/app/main/component/shared/components/events-list-item/events-list-item-modal/events-list-item-modal.component.spec.ts index b5b31fbe84..683ca84dd8 100644 --- a/src/app/main/component/shared/components/events-list-item/events-list-item-modal/events-list-item-modal.component.spec.ts +++ b/src/app/main/component/shared/components/events-list-item/events-list-item-modal/events-list-item-modal.component.spec.ts @@ -1,4 +1,4 @@ -import { Language } from '../../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { Store } from '@ngrx/store'; import { EventsListItemModalComponent } from './events-list-item-modal.component'; diff --git a/src/app/main/component/shared/components/form-base/form-base.component.ts b/src/app/main/component/shared/components/form-base/form-base.component.ts index f796bea1d3..6c00f90af0 100644 --- a/src/app/main/component/shared/components/form-base/form-base.component.ts +++ b/src/app/main/component/shared/components/form-base/form-base.component.ts @@ -5,7 +5,7 @@ import { WarningPopUpComponent } from '@shared/components'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; import { MatDialog } from '@angular/material/dialog'; -import { OrderService } from '../../../../../ubs/ubs/services/order.service'; +import { OrderService } from 'src/app/ubs/ubs/services/order.service'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; @Component({ diff --git a/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts b/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts index 56e005e3e9..93a34dd9a8 100644 --- a/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts +++ b/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts @@ -13,7 +13,7 @@ import 'quill-emoji/dist/quill-emoji.js'; import ImageResize from 'quill-image-resize-module'; import { HabitService } from '@global-service/habit/habit.service'; import { TagInterface } from '@shared/components/tag-filter/tag-filter.model'; -import { quillConfig } from '../../../../events/components/event-editor/quillEditorFunc'; +import { quillConfig } from 'src/app/main/component/events/components/event-editor/quillEditorFunc'; import { ToDoList } from '@global-user/models/to-do-list.interface'; import { FileHandle } from '@eco-news-models/create-news-interface'; import { UserFriendsService } from '@global-user/services/user-friends.service'; diff --git a/src/app/main/component/user/components/habit/add-new-habit/habit-edit-to-do-list/habit-edit-to-do-list.component.ts b/src/app/main/component/user/components/habit/add-new-habit/habit-edit-to-do-list/habit-edit-to-do-list.component.ts index 688cc9571d..a39788bf2d 100644 --- a/src/app/main/component/user/components/habit/add-new-habit/habit-edit-to-do-list/habit-edit-to-do-list.component.ts +++ b/src/app/main/component/user/components/habit/add-new-habit/habit-edit-to-do-list/habit-edit-to-do-list.component.ts @@ -3,7 +3,7 @@ import { Subject, Subscription } from 'rxjs'; import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; import { TranslateService } from '@ngx-translate/core'; -import { ToDoList } from '../../../../models/to-do-list.interface'; +import { ToDoList } from 'src/app/main/component/user/models/to-do-list.interface'; import { TodoStatus } from '../../models/todo-status.enum'; import { MatSnackBarComponent } from '@global-errors/mat-snack-bar/mat-snack-bar.component'; import { FIELD_SYMBOLS_LIMIT, HABIT_TO_DO_LIST_CHECK, TO_DO_ITEM_NAME_LIMIT } from '../../const/data.const'; diff --git a/src/app/main/component/user/components/habit/all-habits/all-habits.component.spec.ts b/src/app/main/component/user/components/habit/all-habits/all-habits.component.spec.ts index 1906264791..88651cf757 100644 --- a/src/app/main/component/user/components/habit/all-habits/all-habits.component.spec.ts +++ b/src/app/main/component/user/components/habit/all-habits/all-habits.component.spec.ts @@ -13,13 +13,13 @@ import { HabitService } from '@global-service/habit/habit.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { EventEmitter, Injectable } from '@angular/core'; import { ProfileService } from '@global-user/components/profile/profile-service/profile.service'; -import { Language } from '../../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { HABITLIST } from '../mocks/habit-mock'; import { CUSTOMHABIT, DEFAULTHABIT, HABITSASSIGNEDLIST } from '../mocks/habit-assigned-mock'; import { FIRSTTAGITEM, SECONDTAGITEM, TAGLIST } from '../mocks/tags-list-mock'; import { EditProfileModel } from '@global-user/models/edit-profile.model'; import { HabitsFiltersList } from '@global-user/components/habit/models/habits-filters-list'; -import { FilterOptions, FilterSelect } from '../../../../../interface/filter-select.interface'; +import { FilterOptions, FilterSelect } from 'src/app/main/interface/filter-select.interface'; @Injectable() class TranslationServiceStub { diff --git a/src/app/main/component/user/components/habit/all-habits/all-habits.component.ts b/src/app/main/component/user/components/habit/all-habits/all-habits.component.ts index 0475587d6e..cc24c02006 100644 --- a/src/app/main/component/user/components/habit/all-habits/all-habits.component.ts +++ b/src/app/main/component/user/components/habit/all-habits/all-habits.component.ts @@ -10,7 +10,7 @@ import { LocalStorageService } from '@global-service/localstorage/local-storage. import { ProfileService } from '@global-user/components/profile/profile-service/profile.service'; import { TagInterface } from '@shared/components/tag-filter/tag-filter.model'; import { FilterOptions, FilterSelect } from 'src/app/main/interface/filter-select.interface'; -import { singleNewsImages } from '../../../../../image-pathes/single-news-images'; +import { singleNewsImages } from 'src/app/main/image-pathes/single-news-images'; import { HabitsFiltersList } from '../models/habits-filters-list'; import { HabitAssignInterface } from '@global-user/components/habit/models/interfaces/habit-assign.interface'; import { HabitInterface, HabitListInterface } from '../models/interfaces/habit.interface'; diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/advice/advice.component.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/advice/advice.component.ts index 315350f2bb..2e2dbff369 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/advice/advice.component.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/advice/advice.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; -import { AdviceService } from '../../../../../../../service/advice/advice.service'; -import { AdviceDto } from '../../../../../../../model/advice/AdviceDto'; +import { AdviceService } from 'src/app/main/service/advice/advice.service'; +import { AdviceDto } from 'src/app/main/model/advice/AdviceDto'; import { Observable } from 'rxjs'; -import { HabitDictionaryDto } from '../../../../../../../model/habit/HabitDictionaryDto'; -import { LanguageService } from '../../../../../../../i18n/language.service'; +import { HabitDictionaryDto } from 'src/app/main/model/habit/HabitDictionaryDto'; +import { LanguageService } from 'src/app/main/i18n/language.service'; @Component({ selector: 'app-advice', diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-chart/habit-chart.component.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-chart/habit-chart.component.ts index 23da097c3b..07e1d74b4a 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-chart/habit-chart.component.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-chart/habit-chart.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, Input, OnChanges } from '@angular/core'; import { Chart } from 'chart.js'; import 'chartjs-plugin-labels'; -import { DayEstimation } from '../../../../../../../model/habit/DayEstimation'; -import { HabitStatisticsDto } from '../../../../../../../model/habit/HabitStatisticsDto'; +import { DayEstimation } from 'src/app/main/model/habit/DayEstimation'; +import { HabitStatisticsDto } from 'src/app/main/model/habit/HabitStatisticsDto'; @Component({ selector: 'app-habit-chart', diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-estimation.component.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-estimation.component.ts index 6239b05d34..f58106d194 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-estimation.component.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-estimation.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { HabitDto } from '../../../../../../../model/habit/HabitDto'; -import { HabitStatisticsDto } from '../../../../../../../model/habit/HabitStatisticsDto'; +import { HabitDto } from 'src/app/main/model/habit/HabitDto'; +import { HabitStatisticsDto } from 'src/app/main/model/habit/HabitStatisticsDto'; @Component({ selector: 'app-habit-estimation', diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item-list/habit-item-list.component.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item-list/habit-item-list.component.ts index d910c0fd69..15ebd7bc16 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item-list/habit-item-list.component.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item-list/habit-item-list.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; -import { HabitDto } from '../../../../../../../../model/habit/HabitDto'; -import { HabitStatisticsDto } from '../../../../../../../../model/habit/HabitStatisticsDto'; -import { HabitStatisticService } from '../../../../../../../../service/habit-statistic/habit-statistic.service'; +import { HabitDto } from 'src/app/main/model/habit/HabitDto'; +import { HabitStatisticsDto } from 'src/app/main/model/habit/HabitStatisticsDto'; +import { HabitStatisticService } from 'src/app/main/service/habit-statistic/habit-statistic.service'; import { filter, map, tap } from 'rxjs/operators'; -import { Photo } from '../../../../../../../../model/photo/photo'; +import { Photo } from 'src/app/main/model/photo/photo'; import { HabitItem } from '../habit-item/HabitItem'; @Component({ diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item/HabitItem.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item/HabitItem.ts index ba66900590..2d34f66d00 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item/HabitItem.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-estimation/habit-item/HabitItem.ts @@ -1,4 +1,4 @@ -import { Photo } from '../../../../../../../../model/photo/photo'; +import { Photo } from 'src/app/main/model/photo/photo'; export class HabitItem { numb: number; diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-fact/habit-fact.component.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-fact/habit-fact.component.ts index 53b2c46ff4..1f2639e373 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-fact/habit-fact.component.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-fact/habit-fact.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; -import { HabitFactDto } from '../../../../../../../model/habit-fact/HabitFactDto'; -import { HabitFactService } from '../../../../../../../service/habit-fact/habit-fact.service'; -import { HabitDictionaryDto } from '../../../../../../../model/habit/HabitDictionaryDto'; -import { LanguageService } from '../../../../../../../i18n/language.service'; +import { HabitFactDto } from 'src/app/main/model/habit-fact/HabitFactDto'; +import { HabitFactService } from 'src/app/main/service/habit-fact/habit-fact.service'; +import { HabitDictionaryDto } from 'src/app/main/model/habit/HabitDictionaryDto'; +import { LanguageService } from 'src/app/main/i18n/language.service'; @Component({ selector: 'app-habit-fact', diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker-date/habit-tracker-date.component.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker-date/habit-tracker-date.component.ts index 97398e573a..ee837ea484 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker-date/habit-tracker-date.component.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker-date/habit-tracker-date.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { LanguageService } from '../../../../../../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; @Component({ selector: 'app-habit-tracker-date', diff --git a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker.component.ts b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker.component.ts index 0f966d8106..a2a04db201 100644 --- a/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker.component.ts +++ b/src/app/main/component/user/components/habit/habit-trackers/habit-tracker/habit-tracker.component.ts @@ -1,10 +1,10 @@ import { Component, Input, OnInit } from '@angular/core'; import { Observable, of } from 'rxjs'; -import { HabitDto } from '../../../../../../model/habit/HabitDto'; -import { HabitStatisticService } from '../../../../../../service/habit-statistic/habit-statistic.service'; +import { HabitDto } from 'src/app/main/model/habit/HabitDto'; +import { HabitStatisticService } from 'src/app/main/service/habit-statistic/habit-statistic.service'; import { filter, map } from 'rxjs/operators'; -import { HabitStatisticsDto } from '../../../../../../model/habit/HabitStatisticsDto'; -import { LanguageService } from '../../../../../../i18n/language.service'; +import { HabitStatisticsDto } from 'src/app/main/model/habit/HabitStatisticsDto'; +import { LanguageService } from 'src/app/main/i18n/language.service'; @Component({ selector: 'app-habit-tracker', diff --git a/src/app/main/component/user/components/habit/mocks/habit-mock.ts b/src/app/main/component/user/components/habit/mocks/habit-mock.ts index 5bf49447f4..afb5262710 100644 --- a/src/app/main/component/user/components/habit/mocks/habit-mock.ts +++ b/src/app/main/component/user/components/habit/mocks/habit-mock.ts @@ -8,7 +8,7 @@ import { CustomHabit } from '@global-user/components/habit/models/interfaces/cus import { CustomHabitDtoRequest } from '@global-user/components/habit/models/interfaces/custom-habit.interface'; import { TodoStatus } from '../models/todo-status.enum'; import { HttpParams } from '@angular/common/http'; -import { AddedCommentDTO, CommentsModel } from '../../../../comments/models/comments-model'; +import { AddedCommentDTO, CommentsModel } from 'src/app/main/component/comments/models/comments-model'; export const MOCK_HABIT_ADDED_COMMENT: AddedCommentDTO = { author: { id: 1, name: 'User', userProfilePicturePath: null }, diff --git a/src/app/main/component/user/components/habit/models/habits-filters-list.ts b/src/app/main/component/user/components/habit/models/habits-filters-list.ts index 609d285a8d..3d275faa89 100644 --- a/src/app/main/component/user/components/habit/models/habits-filters-list.ts +++ b/src/app/main/component/user/components/habit/models/habits-filters-list.ts @@ -1,4 +1,4 @@ -import { FilterSelect } from '../../../../../interface/filter-select.interface'; +import { FilterSelect } from 'src/app/main/interface/filter-select.interface'; export const HabitsFiltersList: FilterSelect[] = [ { diff --git a/src/app/main/component/user/components/profile/calendar/habit-calendar.component.spec.ts b/src/app/main/component/user/components/profile/calendar/habit-calendar.component.spec.ts index 4c9b54027a..6f40a6af23 100644 --- a/src/app/main/component/user/components/profile/calendar/habit-calendar.component.spec.ts +++ b/src/app/main/component/user/components/profile/calendar/habit-calendar.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CalendarBaseComponent } from '@shared/components'; -import { LanguageService } from '../../../../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { MatDialogModule } from '@angular/material/dialog'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; diff --git a/src/app/main/component/user/components/profile/calendar/habits-popup/habits-popup.component.ts b/src/app/main/component/user/components/profile/calendar/habits-popup/habits-popup.component.ts index 5e980d6acb..ee1e4df10b 100644 --- a/src/app/main/component/user/components/profile/calendar/habits-popup/habits-popup.component.ts +++ b/src/app/main/component/user/components/profile/calendar/habits-popup/habits-popup.component.ts @@ -5,7 +5,7 @@ import { takeUntil } from 'rxjs/operators'; import { calendarIcons } from 'src/app/main/image-pathes/calendar-icons'; import { HabitPopupInterface, HabitPopUpRoutes } from '../habit-popup-interface'; import { HabitAssignService } from '@global-service/habit-assign/habit-assign.service'; -import { LanguageService } from '../../../../../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { DatePipe } from '@angular/common'; import { HabitAssignInterface, diff --git a/src/app/main/component/user/components/profile/profile-service/profile.service.spec.ts b/src/app/main/component/user/components/profile/profile-service/profile.service.spec.ts index 21616da749..332b28b0a2 100644 --- a/src/app/main/component/user/components/profile/profile-service/profile.service.spec.ts +++ b/src/app/main/component/user/components/profile/profile-service/profile.service.spec.ts @@ -1,4 +1,4 @@ -import { Language } from './../../../../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { LanguageService } from 'src/app/main/i18n/language.service'; import { BehaviorSubject } from 'rxjs'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; diff --git a/src/app/main/component/user/components/profile/profile-service/profile.service.ts b/src/app/main/component/user/components/profile/profile-service/profile.service.ts index ff9f17ca71..8c0573936f 100644 --- a/src/app/main/component/user/components/profile/profile-service/profile.service.ts +++ b/src/app/main/component/user/components/profile/profile-service/profile.service.ts @@ -6,7 +6,7 @@ import { HttpClient } from '@angular/common/http'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; import { ProfileStatistics } from '@user-models/profile-statistiscs'; import { EditProfileModel } from '@user-models/edit-profile.model'; -import { mainLink, mainUserLink } from '../../../../../links'; +import { mainLink, mainUserLink } from 'src/app/main/links'; import { Patterns } from 'src/assets/patterns/patterns'; @Injectable({ diff --git a/src/app/main/component/user/components/profile/profile-widget/profile-header/profile-header.component.spec.ts b/src/app/main/component/user/components/profile/profile-widget/profile-header/profile-header.component.spec.ts index 7cd351b6a0..9674a1ea93 100644 --- a/src/app/main/component/user/components/profile/profile-widget/profile-header/profile-header.component.spec.ts +++ b/src/app/main/component/user/components/profile/profile-widget/profile-header/profile-header.component.spec.ts @@ -14,7 +14,7 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { UserProfileImageComponent } from '@global-user/components/shared/components/user-profile-image/user-profile-image.component'; import { ActivatedRoute, RouterModule } from '@angular/router'; import { UserOnlineStatusService } from '@global-user/services/user-online-status.service'; -import { routes } from '../../../../../../../app-routing.module'; +import { routes } from 'src/app/app-routing.module'; describe('ProfileHeaderComponent', () => { let component: ProfileHeaderComponent; diff --git a/src/app/main/component/user/components/profile/users-friends/friend-dashboard/friend-dashboard.component.ts b/src/app/main/component/user/components/profile/users-friends/friend-dashboard/friend-dashboard.component.ts index 7cd934b544..691c2e428e 100644 --- a/src/app/main/component/user/components/profile/users-friends/friend-dashboard/friend-dashboard.component.ts +++ b/src/app/main/component/user/components/profile/users-friends/friend-dashboard/friend-dashboard.component.ts @@ -6,7 +6,7 @@ import { debounceTime, takeUntil } from 'rxjs/operators'; import { AllFriendsComponent } from './all-friends/all-friends.component'; import { RecommendedFriendsComponent } from './recommended-friends/recommended-friends.component'; import { FriendRequestsComponent } from './friend-requests/friend-requests.component'; -import { searchIcon } from '../../../../../../image-pathes/places-icons'; +import { searchIcon } from 'src/app/main/image-pathes/places-icons'; import { Store } from '@ngrx/store'; import { IAppState } from 'src/app/store/state/app.state'; diff --git a/src/app/main/component/user/components/shared/components/friends-list-pop-up/friends-list-pop-up.component.ts b/src/app/main/component/user/components/shared/components/friends-list-pop-up/friends-list-pop-up.component.ts index 336e7b5fb7..8a074b4a94 100644 --- a/src/app/main/component/user/components/shared/components/friends-list-pop-up/friends-list-pop-up.component.ts +++ b/src/app/main/component/user/components/shared/components/friends-list-pop-up/friends-list-pop-up.component.ts @@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { HabitAssignService } from '@global-service/habit-assign/habit-assign.service'; import { FriendsHabitPopupModel } from '@global-user/components/habit/models/interfaces/habit-assign.interface'; -import { habitImages } from '../../../../../../image-pathes/habits-images'; +import { habitImages } from 'src/app/main/image-pathes/habits-images'; @Component({ selector: 'app-friends-list-pop-up', diff --git a/src/app/main/pipe/date-localisation-pipe/date-localisation.pipe.spec.ts b/src/app/main/pipe/date-localisation-pipe/date-localisation.pipe.spec.ts index e745586533..5ce676102a 100644 --- a/src/app/main/pipe/date-localisation-pipe/date-localisation.pipe.spec.ts +++ b/src/app/main/pipe/date-localisation-pipe/date-localisation.pipe.spec.ts @@ -1,5 +1,5 @@ import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { Language } from '../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; class MockDateLocalisationPipe { locale: string; diff --git a/src/app/main/pipe/tariff-status-pipe/tariff-status.pipe.spec.ts b/src/app/main/pipe/tariff-status-pipe/tariff-status.pipe.spec.ts index f3070f472d..48f04fc136 100644 --- a/src/app/main/pipe/tariff-status-pipe/tariff-status.pipe.spec.ts +++ b/src/app/main/pipe/tariff-status-pipe/tariff-status.pipe.spec.ts @@ -1,4 +1,4 @@ -import { Language } from '../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { TariffStatusPipe } from './tariff-status.pipe'; describe('TariffStatusPipe', () => { diff --git a/src/app/main/service/advice/advice.service.ts b/src/app/main/service/advice/advice.service.ts index e41aeb6a3f..e1dc90b55a 100644 --- a/src/app/main/service/advice/advice.service.ts +++ b/src/app/main/service/advice/advice.service.ts @@ -1,4 +1,4 @@ -import { Language } from './../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; diff --git a/src/app/main/service/habit-fact/habit-fact.service.ts b/src/app/main/service/habit-fact/habit-fact.service.ts index 7294508442..402170f0d6 100644 --- a/src/app/main/service/habit-fact/habit-fact.service.ts +++ b/src/app/main/service/habit-fact/habit-fact.service.ts @@ -1,4 +1,4 @@ -import { Language } from './../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; diff --git a/src/app/main/service/localstorage/local-storage.service.ts b/src/app/main/service/localstorage/local-storage.service.ts index 5231587572..2ff72d0de2 100644 --- a/src/app/main/service/localstorage/local-storage.service.ts +++ b/src/app/main/service/localstorage/local-storage.service.ts @@ -1,4 +1,4 @@ -import { Language } from '../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; import { Injectable } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; import { EventResponse, PagePreviewDTO } from '../../component/events/models/events.interface'; diff --git a/src/app/main/service/location/location.service.ts b/src/app/main/service/location/location.service.ts index df5aed39b7..b1470b8592 100644 --- a/src/app/main/service/location/location.service.ts +++ b/src/app/main/service/location/location.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { GoogleAutoRequest, GoogleAutoService, GooglePlaceResult, GooglePrediction } from 'src/app/ubs/mocks/google-types'; import { SearchAddress, DistrictsDtos, DistrictEnum } from 'src/app/ubs/ubs/models/ubs.interface'; -import { Language } from '../../i18n/Language'; -import { LanguageService } from '../../i18n/language.service'; +import { Language } from 'src/app/main/i18n/Language'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { AbstractControl } from '@angular/forms'; @Injectable({ diff --git a/src/app/main/service/location/location.spec.ts b/src/app/main/service/location/location.spec.ts index 55d986e759..0b27bc756e 100644 --- a/src/app/main/service/location/location.spec.ts +++ b/src/app/main/service/location/location.spec.ts @@ -1,10 +1,10 @@ import { TestBed } from '@angular/core/testing'; import { LocationService } from './location.service'; import { ADDRESSESMOCK } from 'src/app/ubs/mocks/address-mock'; -import { LanguageService } from '../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { of } from 'rxjs'; import { FormControl } from '@angular/forms'; -import { Language } from '../../i18n/Language'; +import { Language } from 'src/app/main/i18n/Language'; describe('LocationService', () => { let locations; diff --git a/src/app/main/service/news/news.service.spec.ts b/src/app/main/service/news/news.service.spec.ts index e13ecd75b6..75cb6385b9 100644 --- a/src/app/main/service/news/news.service.spec.ts +++ b/src/app/main/service/news/news.service.spec.ts @@ -1,4 +1,4 @@ -import { LanguageService } from './../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { NewsService } from './news.service'; diff --git a/src/app/main/service/news/news.service.ts b/src/app/main/service/news/news.service.ts index db013c5506..186c0b1e5c 100644 --- a/src/app/main/service/news/news.service.ts +++ b/src/app/main/service/news/news.service.ts @@ -1,4 +1,4 @@ -import { LanguageService } from './../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { NewsDto } from '@home-models/NewsDto'; diff --git a/src/app/main/service/socket/socket.service.ts b/src/app/main/service/socket/socket.service.ts index ee64ddad91..69c0ce7aeb 100644 --- a/src/app/main/service/socket/socket.service.ts +++ b/src/app/main/service/socket/socket.service.ts @@ -1,5 +1,5 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { environment } from '../../../../environments/environment'; +import { environment } from 'src/environments/environment'; import { BehaviorSubject, Observable } from 'rxjs'; import SockJS from 'sockjs-client'; import { Stomp, StompSubscription } from '@stomp/stompjs'; diff --git a/src/app/main/service/user/user.service.spec.ts b/src/app/main/service/user/user.service.spec.ts index 7844d07653..bd6861a0b0 100644 --- a/src/app/main/service/user/user.service.spec.ts +++ b/src/app/main/service/user/user.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { UserService } from './user.service'; -import { LanguageService } from './../../i18n/language.service'; +import { LanguageService } from 'src/app/main/i18n/language.service'; import { habitStatisticLink, userLink } from '../../links'; import { LISTOFUSERS, USERCHANGESTATUS, USERCHANGEROLE, GETUSERPAGEBLE, GETUPDATEUSER, HABITITEMS } from '../../mocks/user-service-mock'; diff --git a/src/app/ubs/ubs-admin/components/add-order-not-taken-out-reason/add-order-not-taken-out-reason.component.ts b/src/app/ubs/ubs-admin/components/add-order-not-taken-out-reason/add-order-not-taken-out-reason.component.ts index d792f50be2..2d1150520e 100644 --- a/src/app/ubs/ubs-admin/components/add-order-not-taken-out-reason/add-order-not-taken-out-reason.component.ts +++ b/src/app/ubs/ubs-admin/components/add-order-not-taken-out-reason/add-order-not-taken-out-reason.component.ts @@ -6,7 +6,7 @@ import { FileHandle } from '../../models/file-handle.model'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { OrderService } from '../../services/order.service'; -import { ShowImgsPopUpComponent } from '../../../../shared/show-imgs-pop-up/show-imgs-pop-up.component'; +import { ShowImgsPopUpComponent } from 'src/app/shared/show-imgs-pop-up/show-imgs-pop-up.component'; import { NotTakenOutReasonImage } from '../../models/not-taken-out-reason.model'; @Component({ diff --git a/src/app/ubs/ubs-admin/components/add-payment/add-payment.component.ts b/src/app/ubs/ubs-admin/components/add-payment/add-payment.component.ts index 2c68590f07..6c7c699b86 100644 --- a/src/app/ubs/ubs-admin/components/add-payment/add-payment.component.ts +++ b/src/app/ubs/ubs-admin/components/add-payment/add-payment.component.ts @@ -7,7 +7,7 @@ import { iif, of, Subject } from 'rxjs'; import { switchMap, take, takeUntil } from 'rxjs/operators'; import { IPaymentInfoDto, PaymentDetails } from '../../models/ubs-admin.interface'; import { OrderService } from '../../services/order.service'; -import { ShowImgsPopUpComponent } from '../../../../shared/show-imgs-pop-up/show-imgs-pop-up.component'; +import { ShowImgsPopUpComponent } from 'src/app/shared/show-imgs-pop-up/show-imgs-pop-up.component'; import { ShowPdfPopUpComponent } from '../shared/components/show-pdf-pop-up/show-pdf-pop-up.component'; import { DialogPopUpComponent } from 'src/app/shared/dialog-pop-up/dialog-pop-up.component'; import { Patterns } from 'src/assets/patterns/patterns'; diff --git a/src/app/ubs/ubs-admin/components/add-violations/add-violations.component.ts b/src/app/ubs/ubs-admin/components/add-violations/add-violations.component.ts index 9b659be3dd..7507ba824d 100644 --- a/src/app/ubs/ubs-admin/components/add-violations/add-violations.component.ts +++ b/src/app/ubs/ubs-admin/components/add-violations/add-violations.component.ts @@ -6,7 +6,7 @@ import { switchMap, take, takeUntil } from 'rxjs/operators'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { OrderService } from '../../services/order.service'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { ShowImgsPopUpComponent } from '../../../../shared/show-imgs-pop-up/show-imgs-pop-up.component'; +import { ShowImgsPopUpComponent } from 'src/app/shared/show-imgs-pop-up/show-imgs-pop-up.component'; import { DialogPopUpComponent } from 'src/app/shared/dialog-pop-up/dialog-pop-up.component'; import { PopUpsStyles } from '../ubs-admin-employee/ubs-admin-employee-table/employee-models.enum'; diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-customers/ubs-admin-customer-orders/ubs-admin-customer-orders.component.ts b/src/app/ubs/ubs-admin/components/ubs-admin-customers/ubs-admin-customer-orders/ubs-admin-customer-orders.component.ts index f4593bc327..cfd1bb6f09 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-customers/ubs-admin-customer-orders/ubs-admin-customer-orders.component.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-customers/ubs-admin-customer-orders/ubs-admin-customer-orders.component.ts @@ -5,8 +5,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { Component, OnInit, ChangeDetectorRef, AfterViewChecked, OnDestroy } from '@angular/core'; import { columnsParamsOrders } from '../columnsParams'; import { AdminCustomersService } from 'src/app/ubs/ubs-admin/services/admin-customers.service'; -import { ICustomerOrdersTable } from '../../../models/customer-orders-table.model'; -import { LocalStorageService } from '../../../../../main/service/localstorage/local-storage.service'; +import { ICustomerOrdersTable } from 'src/app/ubs/ubs-admin/models/customer-orders-table.model'; +import { LocalStorageService } from 'src/app/main/service/localstorage/local-storage.service'; @Component({ selector: 'app-ubs-admin-customer-orders', diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.spec.ts b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.spec.ts index 6c7f7af488..e6a804dcb3 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.spec.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.spec.ts @@ -7,10 +7,10 @@ import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { IMaskModule } from 'angular-imask'; import { of } from 'rxjs'; -import { ShowImgsPopUpComponent } from '../../../../../shared/show-imgs-pop-up/show-imgs-pop-up.component'; +import { ShowImgsPopUpComponent } from 'src/app/shared/show-imgs-pop-up/show-imgs-pop-up.component'; import { UbsAdminEmployeeEditFormComponent } from './ubs-admin-employee-edit-form.component'; import { CdkAccordionModule } from '@angular/cdk/accordion'; -import { FileHandle } from '../../../models/file-handle.model'; +import { FileHandle } from 'src/app/ubs/ubs-admin/models/file-handle.model'; describe('UbsAdminEmployeeEditFormComponent', () => { let component: UbsAdminEmployeeEditFormComponent; diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.ts b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.ts index 592cb456ca..b8991a17df 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.ts @@ -1,7 +1,7 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef, MatDialog } from '@angular/material/dialog'; import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms'; -import { UbsAdminEmployeeService } from '../../../services/ubs-admin-employee.service'; +import { UbsAdminEmployeeService } from 'src/app/ubs/ubs-admin/services/ubs-admin-employee.service'; import { Employees, Page, @@ -10,16 +10,16 @@ import { TariffForEmployee, EmployeeDataToSend, Tariff -} from '../../../models/ubs-admin.interface'; +} from 'src/app/ubs/ubs-admin/models/ubs-admin.interface'; import { Store } from '@ngrx/store'; import { IAppState } from 'src/app/store/state/app.state'; import { AddEmployee, UpdateEmployee } from 'src/app/store/actions/employee.actions'; import { skip, takeUntil } from 'rxjs/operators'; -import { ShowImgsPopUpComponent } from '../../../../../shared/show-imgs-pop-up/show-imgs-pop-up.component'; +import { ShowImgsPopUpComponent } from 'src/app/shared/show-imgs-pop-up/show-imgs-pop-up.component'; import { Subject } from 'rxjs'; import { Masks, Patterns } from 'src/assets/patterns/patterns'; import { PhoneNumberValidator } from 'src/app/shared/phone-validator/phone.validator'; -import { TariffsService } from '../../../services/tariffs.service'; +import { TariffsService } from 'src/app/ubs/ubs-admin/services/tariffs.service'; import { LanguageService } from 'src/app/main/i18n/language.service'; import { UploadPhotoContainerComponent } from 'src/app/shared/upload-photo-container/upload-photo-container.component'; import { FileHandle } from '@eco-news-models/create-news-interface'; diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.spec.ts b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.spec.ts index 94c5b93323..9317dff8f4 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.spec.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.spec.ts @@ -14,7 +14,7 @@ import { UbsAdminEmployeeService } from 'src/app/ubs/ubs-admin/services/ubs-admi import { LanguageService } from 'src/app/main/i18n/language.service'; import { UbsAdminEmployeeTableComponent } from './ubs-admin-employee-table.component'; import { UbsAdminEmployeeEditFormComponent } from '../ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component'; -import { DialogPopUpComponent } from '../../../../../shared/dialog-pop-up/dialog-pop-up.component'; +import { DialogPopUpComponent } from 'src/app/shared/dialog-pop-up/dialog-pop-up.component'; describe('UbsAdminEmployeeTableComponent', () => { let component: UbsAdminEmployeeTableComponent; diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.ts b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.ts index a7cf476241..519541ee1c 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-table/ubs-admin-employee-table.component.ts @@ -10,8 +10,8 @@ import { modifiedEmployee } from 'src/app/store/selectors/employee'; import { IAppState } from 'src/app/store/state/app.state'; import { Employees, Page } from 'src/app/ubs/ubs-admin/models/ubs-admin.interface'; import { UbsAdminEmployeeService } from 'src/app/ubs/ubs-admin/services/ubs-admin-employee.service'; -import { DialogPopUpComponent } from '../../../../../shared/dialog-pop-up/dialog-pop-up.component'; -import { FilterData } from '../../../models/tariffs.interface'; +import { DialogPopUpComponent } from 'src/app/shared/dialog-pop-up/dialog-pop-up.component'; +import { FilterData } from 'src/app/ubs/ubs-admin/models/tariffs.interface'; import { UbsAdminEmployeeEditFormComponent } from '../ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component'; import { UbsAdminEmployeePermissionsFormComponent } from '../ubs-admin-employee-permissions-form/ubs-admin-employee-permissions-form.component'; import { EmployeeStatus, PopUpsStyles } from './employee-models.enum'; diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-location-dashboard.component.spec.ts b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-location-dashboard.component.spec.ts index 0e16c9fd78..eca5f22e40 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-location-dashboard.component.spec.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-location-dashboard.component.spec.ts @@ -4,7 +4,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -import { FilterListByLangPipe } from '../../../../shared/sort-list-by-lang/filter-list-by-lang.pipe'; +import { FilterListByLangPipe } from 'src/app/shared/sort-list-by-lang/filter-list-by-lang.pipe'; import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { TariffsService } from '../../services/tariffs.service'; diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-add-tariff-service-pop-up/ubs-admin-tariffs-add-tariff-service-pop-up.component.spec.ts b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-add-tariff-service-pop-up/ubs-admin-tariffs-add-tariff-service-pop-up.component.spec.ts index f7bce3c7d1..3fc97b1d8a 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-add-tariff-service-pop-up/ubs-admin-tariffs-add-tariff-service-pop-up.component.spec.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-add-tariff-service-pop-up/ubs-admin-tariffs-add-tariff-service-pop-up.component.spec.ts @@ -5,10 +5,10 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { UbsAdminTariffsAddTariffServicePopUpComponent } from './ubs-admin-tariffs-add-tariff-service-pop-up.component'; -import { ModalTextComponent } from '../../../shared/components/modal-text/modal-text.component'; +import { ModalTextComponent } from 'src/app/ubs/ubs-admin/components/shared/components/modal-text/modal-text.component'; import { ServerTranslatePipe } from 'src/app/shared/translate-pipe/translate-pipe.pipe'; -import { TariffsService } from '../../../../services/tariffs.service'; -import { Bag } from '../../../../models/tariffs.interface'; +import { TariffsService } from 'src/app/ubs/ubs-admin/services/tariffs.service'; +import { Bag } from 'src/app/ubs/ubs-admin/models/tariffs.interface'; import { Patterns } from '@assets/patterns/patterns'; import { NoopAnimationsModule, BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserModule } from '@angular/platform-browser'; diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.spec.ts b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.spec.ts index 3618eefc38..bff7a40a43 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.spec.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.spec.ts @@ -11,7 +11,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { of, Subject } from 'rxjs'; import { RouterTestingModule } from '@angular/router/testing'; import { UbsAdminTariffsAddServicePopUpComponent } from './ubs-admin-tariffs-add-service-pop-up/ubs-admin-tariffs-add-service-pop-up.component'; -import { FilterListByLangPipe } from '../../../../../shared/sort-list-by-lang/filter-list-by-lang.pipe'; +import { FilterListByLangPipe } from 'src/app/shared/sort-list-by-lang/filter-list-by-lang.pipe'; import { UbsAdminTariffsAddTariffServicePopUpComponent } from './ubs-admin-tariffs-add-tariff-service-pop-up/ubs-admin-tariffs-add-tariff-service-pop-up.component'; import { ActivatedRoute, Router } from '@angular/router'; import { TariffsService } from 'src/app/ubs/ubs-admin/services/tariffs.service'; diff --git a/src/app/ubs/ubs/components/ubs-main-page/ubs-main-page.component.ts b/src/app/ubs/ubs/components/ubs-main-page/ubs-main-page.component.ts index 8817345f54..449328a6eb 100644 --- a/src/app/ubs/ubs/components/ubs-main-page/ubs-main-page.component.ts +++ b/src/app/ubs/ubs/components/ubs-main-page/ubs-main-page.component.ts @@ -1,11 +1,11 @@ -import { CheckTokenService } from './../../../../main/service/auth/check-token/check-token.service'; +import { CheckTokenService } from 'src/app/main/service/auth/check-token/check-token.service'; import { Component, OnDestroy, OnInit, AfterViewChecked, ChangeDetectorRef } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; import { Subject, Subscription } from 'rxjs'; import { takeUntil, finalize, tap, concatMap, switchMap } from 'rxjs/operators'; -import { ubsMainPageImages } from '../../../../main/image-pathes/ubs-main-page-images'; +import { ubsMainPageImages } from 'src/app/main/image-pathes/ubs-main-page-images'; import { Bag, OrderDetails, diff --git a/src/app/ubs/ubs/components/ubs-order-details/ubs-order-certificate/ubs-order-certificate.component.spec.ts b/src/app/ubs/ubs/components/ubs-order-details/ubs-order-certificate/ubs-order-certificate.component.spec.ts index f9aad4ff6b..ccf63c5807 100644 --- a/src/app/ubs/ubs/components/ubs-order-details/ubs-order-certificate/ubs-order-certificate.component.spec.ts +++ b/src/app/ubs/ubs/components/ubs-order-details/ubs-order-certificate/ubs-order-certificate.component.spec.ts @@ -2,14 +2,14 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { UbsOrderCertificateComponent } from './ubs-order-certificate.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { of } from 'rxjs'; -import { LocalizedCurrencyPipe } from '../../../../../shared/localized-currency-pipe/localized-currency.pipe'; +import { LocalizedCurrencyPipe } from 'src/app/shared/localized-currency-pipe/localized-currency.pipe'; import { UbsOrderLocationPopupComponent } from '../ubs-order-location-popup/ubs-order-location-popup.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TranslateModule } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; import { MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { UBSOrderFormService } from '../../../services/ubs-order-form.service'; +import { UBSOrderFormService } from 'src/app/ubs/ubs/services/ubs-order-form.service'; import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { IMaskModule } from 'angular-imask'; diff --git a/src/app/ubs/ubs/components/ubs-order-details/ubs-order-details.component.spec.ts b/src/app/ubs/ubs/components/ubs-order-details/ubs-order-details.component.spec.ts index 52fcda7563..2eb7f2a21a 100644 --- a/src/app/ubs/ubs/components/ubs-order-details/ubs-order-details.component.spec.ts +++ b/src/app/ubs/ubs/components/ubs-order-details/ubs-order-details.component.spec.ts @@ -19,7 +19,7 @@ import { locationIdSelector, orderDetailsSelector, pointsUsedSelector -} from '../../../../store/selectors/order.selectors'; +} from 'src/app/store/selectors/order.selectors'; import { CourierLocations, OrderDetails } from '@ubs/ubs/models/ubs.interface'; import { IUserOrderInfo } from '@ubs/ubs-user/ubs-user-orders-list/models/UserOrder.interface'; import { @@ -28,7 +28,7 @@ import { SetAdditionalOrders, SetBags, SetOrderComment -} from '../../../../store/actions/order.actions'; +} from 'src/app/store/actions/order.actions'; import { ExtraPackagesPopUpComponent } from '@ubs/ubs/components/ubs-order-details/extra-packages-pop-up/extra-packages-pop-up.component'; import { UbsOrderLocationPopupComponent } from '@ubs/ubs/components/ubs-order-details/ubs-order-location-popup/ubs-order-location-popup.component'; diff --git a/src/app/ubs/ubs/components/ubs-submit-order/ubs-submit-order.component.spec.ts b/src/app/ubs/ubs/components/ubs-submit-order/ubs-submit-order.component.spec.ts index 33a22cea1e..cb85cfb4a7 100644 --- a/src/app/ubs/ubs/components/ubs-submit-order/ubs-submit-order.component.spec.ts +++ b/src/app/ubs/ubs/components/ubs-submit-order/ubs-submit-order.component.spec.ts @@ -11,7 +11,7 @@ import { LocalStorageService } from '@global-service/localstorage/local-storage. import { LanguageService } from 'src/app/main/i18n/language.service'; import { orderDetailsMock, personalMockData } from 'src/app/ubs/mocks/order-data-mock'; import { Store } from '@ngrx/store'; -import { orderDetailsSelector, orderSelectors, personalDataSelector } from '../../../../store/selectors/order.selectors'; +import { orderDetailsSelector, orderSelectors, personalDataSelector } from 'src/app/store/selectors/order.selectors'; import { WarningPopUpComponent } from '@shared/components'; import { HttpErrorResponse } from '@angular/common/http';