Skip to content

Commit

Permalink
better shared module structure
Browse files Browse the repository at this point in the history
  • Loading branch information
Pop John committed Jul 12, 2024
1 parent 55a0529 commit f5ef1a3
Show file tree
Hide file tree
Showing 137 changed files with 83 additions and 83 deletions.
2 changes: 1 addition & 1 deletion frontend/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { AuthGuard } from './modules/core/guards/auth.guard';
import { ModeSelectGuard } from './modules/core/guards/mode-select.guard';
import { RedirectIfAuthenticatedGuard } from './modules/core/guards/redirect-if-authenticated.guard';
import { RoutesList } from './modules/core/models/enums/routes-list.enum';
import { MsMainLayoutComponent } from './modules/shared/standalone/ms-main-layout/ms-main-layout.component';
import { MsMainLayoutComponent } from './modules/shared/components/ms-main-layout/ms-main-layout.component';

export const routes: Routes = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import { StoreModule } from '@ngrx/store';
import { NgxColorsModule } from 'ngx-colors';
import { runRecordsReducers } from '../../state/run-records';
import { RecordsEffects } from '../../state/run-records/records';
import { EllipsisDirective } from '../shared/standalone/ellipsis.directive';
import { DrawerService, MsDrawerComponent } from '../shared/standalone/ms-drawer';
import { MsEmptyStateComponent } from '../shared/standalone/ms-empty-state/ms-empty-state.component';
import { MsLineChartComponent } from '../shared/standalone/ms-line-chart/ms-line-chart.component';
import { ChartToolsGlobalSignalsService } from '../shared/standalone/ms-line-chart/services/chart-tools-global-signals.service';
import { DrawerService, MsDrawerComponent } from '../shared/components/ms-drawer';
import { MsEmptyStateComponent } from '../shared/components/ms-empty-state/ms-empty-state.component';
import { MsLineChartComponent } from '../shared/components/ms-line-chart/ms-line-chart.component';
import { ChartToolsGlobalSignalsService } from '../shared/components/ms-line-chart/services/chart-tools-global-signals.service';
import { EllipsisDirective } from '../shared/directives/ellipsis.directive';

import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import { Component } from '@angular/core';
import { MatSlideToggleChange } from '@angular/material/slide-toggle';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { ChartDatasets } from '../../../../services/client/models/charts/chart-data.interface-dto';
import { isEmptyArray } from '../../../shared/shared.utils';
import { ChartColorEnum } from '../../../shared/standalone/ms-line-chart/models/enums/chart-color.enum';
import { ChartColorEnum } from '../../../shared/components/ms-line-chart/models/enums/chart-color.enum';
import {
ChartDataStructure,
ChartDisplaySettings
} from '../../../shared/standalone/ms-line-chart/models/interfaces/ms-chart-display-settings.interface';
import { ChartToolsGlobalSignalsService } from '../../../shared/standalone/ms-line-chart/services/chart-tools-global-signals.service';
} from '../../../shared/components/ms-line-chart/models/interfaces/ms-chart-display-settings.interface';
import { ChartToolsGlobalSignalsService } from '../../../shared/components/ms-line-chart/services/chart-tools-global-signals.service';
import { isEmptyArray } from '../../../shared/shared.utils';
import { RecordComparisonItem } from '../../models/record-comparisson.interface';
import { RecordsDataService } from '../../services/records-data.service';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import { Component } from '@angular/core';
import { take } from 'rxjs';
import { DrawerClose, DrawerService, DrawerStatus } from '../../../shared/components/ms-drawer';
import { DrawerActionTypeEnum } from '../../../shared/components/ms-drawer/models/drawer-action-type.enum';
import { isEmptyObject } from '../../../shared/shared.utils';
import { DrawerClose, DrawerService, DrawerStatus } from '../../../shared/standalone/ms-drawer';
import { DrawerActionTypeEnum } from '../../../shared/standalone/ms-drawer/models/drawer-action-type.enum';
import { RecordComparisonItem } from '../../models/record-comparisson.interface';
import { RecordsDataService } from '../../services/records-data.service';
import { RunDrawerActionsComponent } from '../run-drawer-actions/run-drawer-actions.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { take } from 'rxjs';
import { KeyValueObject } from '../../../../services/client/models/key-value/key-value.interface-dto';
import { AlgorithmType } from '../../../model-compression/models/enums/algorithms.enum';
import { DrawerClose, DrawerService, DrawerStatus } from '../../../shared/standalone/ms-drawer';
import { DrawerActionTypeEnum } from '../../../shared/standalone/ms-drawer/models/drawer-action-type.enum';
import { DrawerClose, DrawerService, DrawerStatus } from '../../../shared/components/ms-drawer';
import { DrawerActionTypeEnum } from '../../../shared/components/ms-drawer/models/drawer-action-type.enum';
import { RecordComparisonItem } from '../../models/record-comparisson.interface';
import { RecordsDataService } from '../../services/records-data.service';
import { RunDrawerActionsComponent } from '../run-drawer-actions/run-drawer-actions.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ import {
} from '../../../../services/interceptor/app-loading-interceptor';
import { RunRecordsActions } from '../../../../state/run-records/records';
import { AlgorithmType } from '../../../model-compression/models/enums/algorithms.enum';
import { isEmptyObject, isNilOrEmptyString } from '../../../shared/shared.utils';
import { DRAWER_DATA, DrawerConfig, DrawerRef, DrawerStatus } from '../../../shared/standalone/ms-drawer';
import { DrawerActionTypeEnum } from '../../../shared/standalone/ms-drawer/models/drawer-action-type.enum';
import { chartColorsSettings } from '../../../shared/standalone/ms-line-chart/models/constants/chart-color-settings.constants';
import { ChartColorEnum } from '../../../shared/standalone/ms-line-chart/models/enums/chart-color.enum';
import { DRAWER_DATA, DrawerConfig, DrawerRef, DrawerStatus } from '../../../shared/components/ms-drawer';
import { DrawerActionTypeEnum } from '../../../shared/components/ms-drawer/models/drawer-action-type.enum';
import { chartColorsSettings } from '../../../shared/components/ms-line-chart/models/constants/chart-color-settings.constants';
import { ChartColorEnum } from '../../../shared/components/ms-line-chart/models/enums/chart-color.enum';
import {
ChartDataStructure,
ChartDisplaySettings
} from '../../../shared/standalone/ms-line-chart/models/interfaces/ms-chart-display-settings.interface';
} from '../../../shared/components/ms-line-chart/models/interfaces/ms-chart-display-settings.interface';
import { isEmptyObject, isNilOrEmptyString } from '../../../shared/shared.utils';
import { RecordComparisonChartColors, RecordComparisonItem } from '../../models/record-comparisson.interface';
import { RecordsDataService } from '../../services/records-data.service';
import { RecordsFacadeService } from '../../services/records-facade.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { AlgorithmType } from '../../model-compression/models/enums/algorithms.enum';
import { ChartToolsGlobalSignalsService } from '../../shared/standalone/ms-line-chart/services/chart-tools-global-signals.service';
import { ChartToolsGlobalSignalsService } from '../../shared/components/ms-line-chart/services/chart-tools-global-signals.service';
import { RecordComparisonItem } from '../models/record-comparisson.interface';

@Injectable()
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/modules/auth/auth.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MsBackgroundGradientComponent } from '../shared/standalone/ms-background-gradient/ms-background-gradient.component';
import { MsFooterComponent } from '../shared/standalone/ms-footer/ms-footer.component';
import { PasswordToggleDirective } from '../shared/standalone/password-toggle.directive';
import { MsBackgroundGradientComponent } from '../shared/components/ms-background-gradient/ms-background-gradient.component';
import { MsFooterComponent } from '../shared/components/ms-footer/ms-footer.component';
import { PasswordToggleDirective } from '../shared/directives/password-toggle.directive';
import { AuthRoutingModule } from './auth-routing.module';
import { LoginComponent } from './components/login/login.component';

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/modules/core/services/file.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { FileActions } from '../../../state/core/file/file.actions';
import { BannerService } from '../../shared/standalone/ms-banner/services/banner.service';
import { BannerService } from '../../shared/components/ms-banner/services/banner.service';
import { FileFacadeService } from './file-facade.service';

@Injectable()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/modules/core/services/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// SPDX-License-Identifier: Apache-2.0

export * from '../../shared/standalone/ms-banner/services/banner.service';
export * from '../../shared/components/ms-banner/services/banner.service';
export * from './auth-facade.service';
export * from './charts-facade.service';
export * from './configs-facade.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// SPDX-License-Identifier: Apache-2.0

import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { DRAWER_DATA, DrawerConfig, DrawerRef } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerConfig, DrawerRef } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-run-drawer-actions',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { take } from 'rxjs';
import { DrawerConfig, DrawerService } from '../../../shared/standalone/ms-drawer';
import { DrawerConfig, DrawerService } from '../../../shared/components/ms-drawer';
import { DrawerBasicDemoComponent } from './drawer-basic-demo/drawer-basic-demo.component';
import { DrawerWithAlternativeActionsTemplateComponent } from './drawer-with-alternative-actions-template/drawer-with-alternative-actions-template.component';
import { DrawerWithAlternativeHeaderTemplateComponent } from './drawer-with-alternative-header-template/drawer-with-alternative-header-template.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// SPDX-License-Identifier: Apache-2.0

import { Component, Inject, OnInit } from '@angular/core';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-drawer-with-alternative-actions-template',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// SPDX-License-Identifier: Apache-2.0

import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-drawer-with-alternative-header-template',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { Component, Inject, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { DRAWER_DATA, DrawerRef, DrawerStatus } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerRef, DrawerStatus } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-drawer-with-buttons-actions',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// SPDX-License-Identifier: Apache-2.0

import { Component, Inject, OnInit } from '@angular/core';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-drawer-with-customizable-width',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// SPDX-License-Identifier: Apache-2.0

import { Component, Inject, OnInit } from '@angular/core';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerRef } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-drawer-with-disabled-buttons-actions',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// SPDX-License-Identifier: Apache-2.0

import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { DRAWER_DATA, DrawerConfig, DrawerRef } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerConfig, DrawerRef } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-drawer-with-injected-data',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// SPDX-License-Identifier: Apache-2.0

import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { DRAWER_DATA, DrawerConfig, DrawerRef } from '../../../../shared/standalone/ms-drawer';
import { DRAWER_DATA, DrawerConfig, DrawerRef } from '../../../../shared/components/ms-drawer';

@Component({
selector: 'ms-drawer-with-only-one-button',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/modules/demo/demo.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { MatStepperModule } from '@angular/material/stepper';
import { MatTableModule } from '@angular/material/table';
import { RouterModule } from '@angular/router';
import { MsCardSelectorComponent } from '../shared/standalone/ms-card-selector/ms-card-selector.component';
import { DrawerService, MsDrawerComponent } from '../shared/standalone/ms-drawer';
import { MsCardSelectorComponent } from '../shared/components/ms-card-selector/ms-card-selector.component';
import { DrawerService, MsDrawerComponent } from '../shared/components/ms-drawer';
import { ButtonsDemoComponent } from './components/buttons-demo/buttons-demo.component';
import { CardsDemoComponent } from './components/cards-demo/cards-demo.component';
import { CheckboxesDemoComponent } from './components/checkboxes-demo/checkboxes-demo.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { ScriptActions } from '../../../../state/core/script';
import { ScriptFacadeService } from '../../../core/services';
import { AWQAlgorithmsEnum, AlgorithmType } from '../../../model-compression/models/enums/algorithms.enum';
import { isScriptActive } from '../../../model-compression/models/enums/script-status.enum';
import { MsPanelParametersComponent } from '../../../shared/standalone/ms-panel-parameters/ms-panel-parameters.component';
import { MsPanelParametersComponent } from '../../../shared/components/ms-panel-parameters/ms-panel-parameters.component';

@UntilDestroy()
@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MsPanelModelComponent } from '../shared/standalone/ms-panel-model/ms-panel-model.component';
import { MsPanelParametersComponent } from '../shared/standalone/ms-panel-parameters/ms-panel-parameters.component';
import { MsTerminalComponent } from '../shared/standalone/ms-terminal/ms-terminal.component';
import { MsPanelModelComponent } from '../shared/components/ms-panel-model/ms-panel-model.component';
import { MsPanelParametersComponent } from '../shared/components/ms-panel-parameters/ms-panel-parameters.component';
import { MsTerminalComponent } from '../shared/components/ms-terminal/ms-terminal.component';
import { LlmQuantizationComponent } from './components/llm-quantization/llm-quantization.component';
import { LlmQuantizationRoutingModule } from './llm-quantization-routing.module';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
MachineUnlearningAlgorithmsEnum
} from '../../../model-compression/models/enums/algorithms.enum';
import { isScriptActive } from '../../../model-compression/models/enums/script-status.enum';
import { MsPanelParametersComponent } from '../../../shared/standalone/ms-panel-parameters/ms-panel-parameters.component';
import { MsPanelParametersComponent } from '../../../shared/components/ms-panel-parameters/ms-panel-parameters.component';

@UntilDestroy()
@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MsPanelModelComponent } from '../shared/standalone/ms-panel-model/ms-panel-model.component';
import { MsPanelParametersComponent } from '../shared/standalone/ms-panel-parameters/ms-panel-parameters.component';
import { MsTerminalComponent } from '../shared/standalone/ms-terminal/ms-terminal.component';
import { MsPanelModelComponent } from '../shared/components/ms-panel-model/ms-panel-model.component';
import { MsPanelParametersComponent } from '../shared/components/ms-panel-parameters/ms-panel-parameters.component';
import { MsTerminalComponent } from '../shared/components/ms-terminal/ms-terminal.component';
import { MachineUnlearningComponent } from './components/machine-unlearning/machine-unlearning.component';
import { MachineUnlearningRoutingModule } from './machine-unlearning-routing.module';

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/modules/mode-select/mode-select.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MsBackgroundGradientComponent } from '../shared/standalone/ms-background-gradient/ms-background-gradient.component';
import { MsFooterComponent } from '../shared/standalone/ms-footer/ms-footer.component';
import { MsHeaderComponent } from '../shared/standalone/ms-header/ms-header.component';
import { MsBackgroundGradientComponent } from '../shared/components/ms-background-gradient/ms-background-gradient.component';
import { MsFooterComponent } from '../shared/components/ms-footer/ms-footer.component';
import { MsHeaderComponent } from '../shared/components/ms-header/ms-header.component';
import { ModeSelectComponent } from './components/mode-select/mode-select.component';
import { ModeSelectRoutingModule } from './mode-select-routing.module';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import { ScriptActions } from '../../../../state/core/script';
import { RoutesList } from '../../../core/models/enums/routes-list.enum';
import { FileService } from '../../../core/services/file.service';
import { ScriptFacadeService } from '../../../core/services/script-facade.service';
import { BannerService } from '../../../shared/components/ms-banner/services/banner.service';
import { MsPanelParametersComponent } from '../../../shared/components/ms-panel-parameters/ms-panel-parameters.component';
import { isNil } from '../../../shared/shared.utils';
import { BannerService } from '../../../shared/standalone/ms-banner/services/banner.service';
import { MsPanelParametersComponent } from '../../../shared/standalone/ms-panel-parameters/ms-panel-parameters.component';
import { CUSTOM_MODEL } from '../../models/constants/supported-models.constants';
import {
AlgorithmKey,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatSelectModule } from '@angular/material/select';
import { MsPanelModelComponent } from '../shared/standalone/ms-panel-model/ms-panel-model.component';
import { MsPanelParametersComponent } from '../shared/standalone/ms-panel-parameters/ms-panel-parameters.component';
import { MsTerminalComponent } from '../shared/standalone/ms-terminal/ms-terminal.component';
import { MsPanelModelComponent } from '../shared/components/ms-panel-model/ms-panel-model.component';
import { MsPanelParametersComponent } from '../shared/components/ms-panel-parameters/ms-panel-parameters.component';
import { MsTerminalComponent } from '../shared/components/ms-terminal/ms-terminal.component';
import { PanelAlgorithmComponent } from './components/panel-algorithm/panel-algorithm.component';
import { ProjectSettingsComponent } from './components/project-settings/project-settings.component';
import { ModelCompressionRoutingModule } from './model-compression-routing.module';
Expand Down
Loading

0 comments on commit f5ef1a3

Please sign in to comment.