diff --git a/frontend/src/app/modules/core/guards/auth.guard.ts b/frontend/src/app/modules/core/guards/auth.guard.ts index 057b7580..0bb68b8f 100644 --- a/frontend/src/app/modules/core/guards/auth.guard.ts +++ b/frontend/src/app/modules/core/guards/auth.guard.ts @@ -17,9 +17,9 @@ import { Injectable } from '@angular/core'; import { Router, UrlTree } from '@angular/router'; import { Observable } from 'rxjs'; -import { StorageKeys } from '../models/constants/storage.constants'; +import { StorageApp } from '../../shared/storage/storage-app'; +import { StorageKeys } from '../../shared/storage/storage.constants'; import { RoutesList } from '../models/enums/routes-list.enum'; -import { StorageApp } from '../storage/storage-app'; @Injectable() export class AuthGuard { diff --git a/frontend/src/app/modules/core/guards/mode-select.guard.ts b/frontend/src/app/modules/core/guards/mode-select.guard.ts index 39b85ea9..3b31a858 100644 --- a/frontend/src/app/modules/core/guards/mode-select.guard.ts +++ b/frontend/src/app/modules/core/guards/mode-select.guard.ts @@ -18,11 +18,11 @@ import { Injectable } from '@angular/core'; import { Router, UrlTree } from '@angular/router'; import { Observable } from 'rxjs'; import { ConfigActions } from '../../../state/core/configs/configs.actions'; -import { StorageKeys } from '../models/constants/storage.constants'; +import { StorageApp } from '../../shared/storage/storage-app'; +import { StorageKeys } from '../../shared/storage/storage.constants'; import { AppModes } from '../models/enums/app-modes.enum'; import { RoutesList } from '../models/enums/routes-list.enum'; import { ConfigsFacadeService } from '../services/configs-facade.service'; -import { StorageApp } from '../storage/storage-app'; @Injectable() export class ModeSelectGuard { diff --git a/frontend/src/app/modules/core/guards/redirect-if-authenticated.guard.ts b/frontend/src/app/modules/core/guards/redirect-if-authenticated.guard.ts index c386d0fb..cf8be753 100644 --- a/frontend/src/app/modules/core/guards/redirect-if-authenticated.guard.ts +++ b/frontend/src/app/modules/core/guards/redirect-if-authenticated.guard.ts @@ -17,9 +17,9 @@ import { Injectable } from '@angular/core'; import { CanActivate, Router, UrlTree } from '@angular/router'; import { Observable } from 'rxjs'; -import { StorageKeys } from '../models/constants/storage.constants'; +import { StorageApp } from '../../shared/storage/storage-app'; +import { StorageKeys } from '../../shared/storage/storage.constants'; import { RoutesList } from '../models/enums/routes-list.enum'; -import { StorageApp } from '../storage/storage-app'; @Injectable() export class RedirectIfAuthenticatedGuard implements CanActivate { diff --git a/frontend/src/app/modules/core/models/interfaces/terminal-message.interface.ts b/frontend/src/app/modules/core/models/interfaces/terminal-message.interface.ts index ea530845..74615c2e 100644 --- a/frontend/src/app/modules/core/models/interfaces/terminal-message.interface.ts +++ b/frontend/src/app/modules/core/models/interfaces/terminal-message.interface.ts @@ -1,4 +1,4 @@ -import { NotificationTypes } from '../enums/snackbar-types.enum'; +import { NotificationTypes } from '../../../shared/components/ms-banner/models/snackbar-types.enum'; export interface TerminalMessage { data: string; diff --git a/frontend/src/app/modules/core/models/enums/snackbar-types.enum.ts b/frontend/src/app/modules/shared/components/ms-banner/models/snackbar-types.enum.ts similarity index 100% rename from frontend/src/app/modules/core/models/enums/snackbar-types.enum.ts rename to frontend/src/app/modules/shared/components/ms-banner/models/snackbar-types.enum.ts diff --git a/frontend/src/app/modules/shared/components/ms-banner/ms-banner.component.ts b/frontend/src/app/modules/shared/components/ms-banner/ms-banner.component.ts index 9b449875..1088eef6 100644 --- a/frontend/src/app/modules/shared/components/ms-banner/ms-banner.component.ts +++ b/frontend/src/app/modules/shared/components/ms-banner/ms-banner.component.ts @@ -18,7 +18,7 @@ import { CommonModule } from '@angular/common'; import { Component, Inject } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar'; -import { NotificationTypes } from '../../../core/models/enums/snackbar-types.enum'; +import { NotificationTypes } from './models/snackbar-types.enum'; @Component({ selector: 'ms-banner', diff --git a/frontend/src/app/modules/shared/components/ms-banner/services/banner.service.ts b/frontend/src/app/modules/shared/components/ms-banner/services/banner.service.ts index 4a5715ab..10dafc71 100644 --- a/frontend/src/app/modules/shared/components/ms-banner/services/banner.service.ts +++ b/frontend/src/app/modules/shared/components/ms-banner/services/banner.service.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { NotificationTypes } from '../../../../core/models/enums/snackbar-types.enum'; +import { NotificationTypes } from '../models/snackbar-types.enum'; import { MsBannerComponent } from '../ms-banner.component'; export const DEFAULT_SUCCESS_SNACKBAR_DURATION: number = 5000; diff --git a/frontend/src/app/modules/shared/components/ms-terminal/ms-terminal.component.ts b/frontend/src/app/modules/shared/components/ms-terminal/ms-terminal.component.ts index a23e4a0f..7fe6ca32 100644 --- a/frontend/src/app/modules/shared/components/ms-terminal/ms-terminal.component.ts +++ b/frontend/src/app/modules/shared/components/ms-terminal/ms-terminal.component.ts @@ -23,13 +23,13 @@ import { KeyValue } from '../../../../services/client/models/key-value/key-value import { ScriptDetails } from '../../../../services/client/models/script/script-details.interface-dto'; import { ModelsActions } from '../../../../state/core/models/models.actions'; import { TerminalActions } from '../../../../state/core/terminal/terminal.actions'; -import { NotificationTypes } from '../../../core/models/enums/snackbar-types.enum'; import { TerminalMessage } from '../../../core/models/interfaces/terminal-message.interface'; import { ScriptFacadeService } from '../../../core/services'; import { ModelsFacadeService } from '../../../core/services/models-facade.service'; import { TerminalFacadeService } from '../../../core/services/terminal-facade.service'; import { WebsocketService } from '../../../core/services/websocket.service'; import { AlgorithmType, TrainAlgorithmsEnum } from '../../../model-compression/models/enums/algorithms.enum'; +import { NotificationTypes } from '../ms-banner/models/snackbar-types.enum'; import { MsTerminalToolbarComponent } from './components/terminal-toolbar/terminal-toolbar.component'; @UntilDestroy() diff --git a/frontend/src/app/modules/core/storage/storage-app.ts b/frontend/src/app/modules/shared/storage/storage-app.ts similarity index 100% rename from frontend/src/app/modules/core/storage/storage-app.ts rename to frontend/src/app/modules/shared/storage/storage-app.ts diff --git a/frontend/src/app/modules/core/models/constants/storage.constants.ts b/frontend/src/app/modules/shared/storage/storage.constants.ts similarity index 100% rename from frontend/src/app/modules/core/models/constants/storage.constants.ts rename to frontend/src/app/modules/shared/storage/storage.constants.ts diff --git a/frontend/src/app/state/app.metareducers.ts b/frontend/src/app/state/app.metareducers.ts index 8ed8a109..6b9f4a8f 100644 --- a/frontend/src/app/state/app.metareducers.ts +++ b/frontend/src/app/state/app.metareducers.ts @@ -16,7 +16,7 @@ import { ActionReducer, MetaReducer } from '@ngrx/store'; import { localStorageSync } from 'ngrx-store-localstorage'; -import { StorageKeys } from '../modules/core/models/constants/storage.constants'; +import { StorageKeys } from '../modules/shared/storage/storage.constants'; /** * `localStorageSyncReducer` is a meta-reducer for synchronizing specific parts of the state