diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-update-form/group-update-form.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-update-form/group-update-form.component.ts index cd99de9..053f264 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-update-form/group-update-form.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-update-form/group-update-form.component.ts @@ -1,5 +1,5 @@ import { Component, inject, signal } from '@angular/core'; -import { Group } from '../../../models/user-management.api.models'; +import { Group } from '../../../services/api/api-models'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/rep-create-form/rep-create-form.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/rep-create-form/rep-create-form.component.ts index 1e1c826..9284cc4 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/rep-create-form/rep-create-form.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/rep-create-form/rep-create-form.component.ts @@ -1,5 +1,5 @@ import { Component, inject, ChangeDetectionStrategy, signal, OnInit, computed } from '@angular/core'; -import { UserRep } from '../../../models/user-management.api.models'; +import { UserRep } from '../../../services/api/api-models'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UserRepService } from '../../../services/api/user-representation.service'; import { GroupUpdateFormComponent } from '../group-update-form/group-update-form.component'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-update-form/user-update-form.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-update-form/user-update-form.component.ts index 49e1124..60fa693 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-update-form/user-update-form.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-update-form/user-update-form.component.ts @@ -1,5 +1,5 @@ import { Component, inject, signal } from '@angular/core'; -import { User } from '../../../models/user-management.api.models'; +import { User } from '../../../services/api/api-models'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormControl, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts index 9203f5b..d6ee852 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts @@ -5,7 +5,7 @@ import { GroupService } from '../../services/api/group.service'; import { Observable, forkJoin, of } from 'rxjs'; import { catchError, finalize } from 'rxjs/operators'; import { DirGroupTableComponent } from '../tables/dir-group-table/dir-group-table.component'; -import { DirGroup } from '../../models/user-management.api.models'; +import { DirGroup } from '../../services/api/api-models'; @Component({ standalone: true, diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/summaries/user-summary/user-summary.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/summaries/user-summary/user-summary.component.ts index 56f2568..ea8389d 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/summaries/user-summary/user-summary.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/summaries/user-summary/user-summary.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { MatListModule } from '@angular/material/list'; -import { User } from '../../../models/user-management.api.models' +import { User } from '../../../services/api/api-models' import { MAT_BOTTOM_SHEET_DATA } from '@angular/material/bottom-sheet'; @Component({ diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts index c3e8b57..c86feec 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BaseTableComponent } from './base-table.component'; -import { ApiService } from '../../../services/api/user-management.api.service'; +import { ApiService } from '../../../services/api/api-service'; import { NO_ERRORS_SCHEMA } from '@angular/core'; describe('BaseTableComponent', () => { diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts index eefa47f..8f97cd0 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, Input, OnDestroy, OnInit, ViewChild, input } from '@angular/core'; -import { ApiService } from '../../../services/api/user-management.api.service'; +import { ApiService } from '../../../services/api/api-service'; import { GuiGridModule, GuiColumn, GuiColumnMenu, GuiSorting, GuiRowDetail, GuiPaging, GuiPagingDisplay, GuiSearching, GuiCellEdit, GuiInfoPanel, GuiTitlePanel, GuiRowSelection, GuiSelectedRow, GuiGridComponent, GuiGridApi, GuiTheme, GuiRowStyle, GuiRowClass } from '@generic-ui/ngx-grid'; import { Subscription } from 'rxjs/internal/Subscription'; import { ColorModeService, Theme } from '../../../services/button/color-mode.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts index e322d25..0a612e2 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts @@ -1,7 +1,7 @@ import { Component, Inject } from '@angular/core'; import { BaseTableComponent } from '../base-table/base-table.component'; import { DirGroupService } from '../../../services/api/dir-group.service'; -import { DirGroup } from '../../../models/user-management.api.models'; +import { DirGroup } from '../../../services/api/api-models'; import { GuiGridModule } from '@generic-ui/ngx-grid'; import { ColorModeService } from '../../../services/button/color-mode.service'; import { CommonModule } from '@angular/common'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts index 72fb2eb..90d10b0 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { DirUser } from '../../../models/user-management.api.models'; +import { DirUser } from '../../../services/api/api-models'; import { DirUserService } from '../../../services/api/dir-user.service'; import { BaseTableComponent } from '../base-table/base-table.component'; import { GuiGridModule, GuiColumn } from '@generic-ui/ngx-grid'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts index 949ada4..c434af6 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { GroupService } from '../../../services/api/group.service'; -import { Group } from '../../../models/user-management.api.models'; +import { Group } from '../../../services/api/api-models'; import { GuiGridModule, GuiColumn } from '@generic-ui/ngx-grid'; import { BaseTableComponent } from '../base-table/base-table.component'; import { ColorModeService } from '../../../services/button/color-mode.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-user-table/group-user-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-user-table/group-user-table.component.ts index 2ee0d3b..63e9e01 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-user-table/group-user-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-user-table/group-user-table.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { GroupOfUserService } from '../../../services/group-of-user.service'; -import { GroupOfUser } from '../../../models/user-management.api.models'; +import { GroupOfUser } from '../../../services/api/api-models'; import { GuiGridModule, GuiColumn } from '@generic-ui/ngx-grid'; import { BaseTableComponent } from '../base-table/base-table.component'; import { ColorModeService } from '../../../services/color-mode.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts index 85ae8cd..71035ef 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Module } from '../../../models/user-management.api.models'; +import { Module } from '../../../services/api/api-models'; import { GuiGridModule } from '@generic-ui/ngx-grid'; import { BaseTableComponent } from '../base-table/base-table.component'; import { ModuleService } from '../../../services/api/module.service' diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts index 735b4b5..0e74f26 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { UserRep } from '../../../models/user-management.api.models'; +import { UserRep } from '../../../services/api/api-models'; import { UserRepService } from '../../../services/api/user-representation.service'; import { BaseTableComponent } from '../base-table/base-table.component'; import { GuiGridModule } from '@generic-ui/ngx-grid'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts index 168144c..3db055d 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { UserService } from '../../../services/api/user.service'; import { ModuleOfUserService } from '../../../services/api/module-of-user.service'; import { GroupOfUserService } from '../../../services/api/group-of-user.service'; -import { User } from '../../../models/user-management.api.models'; +import { User } from '../../../services/api/api-models'; import { GuiGridModule } from '@generic-ui/ngx-grid'; import { BaseTableComponent } from '../base-table/base-table.component'; import { ColorModeService } from '../../../services/button/color-mode.service' diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts index 2333e79..7d6a752 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts @@ -7,7 +7,7 @@ import { catchError, finalize } from 'rxjs/operators'; import { DirGroupTableComponent } from '../tables/dir-group-table/dir-group-table.component'; import { DirUserTableComponent } from '../tables/dir-user-table/dir-user-table.component'; import { UserService } from '../../services/api/user.service'; -import { User } from '../../models/user-management.api.models' +import { User } from '../../services/api/api-models' import { RefreshService } from '../../services/button/refresh.service'; @Component({ diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.ts index 623e21e..a376d5e 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.ts @@ -5,7 +5,7 @@ import { MatTabsModule } from '@angular/material/tabs'; import { GuiCellEdit, GuiSelectedRow } from '@generic-ui/ngx-grid'; import { GroupFormComponent } from '../../components/forms/group-form/group-form.component'; import { BasePageComponent } from '../base-page/base-page.component'; -import { Group } from '../../models/user-management.api.models'; +import { Group } from '../../services/api/api-models'; import { firstValueFrom, forkJoin } from 'rxjs'; import Swal from 'sweetalert2'; import { env } from '../../../environments/environment'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts index f27ff67..230fb6d 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts @@ -4,7 +4,7 @@ import { GuiRowSelection, GuiRowSelectionMode, GuiRowSelectionType, GuiSelectedR import { UserTableComponent } from '../../components/tables/user-table/user-table.component'; import { ModuleTableComponent } from '../../components/tables/module-table/module-table.component'; import { GroupTableComponent } from '../../components/tables/group-table/group-table.component'; -import { User } from '../../models/user-management.api.models'; +import { User } from '../../services/api/api-models'; import { MatTabsModule, MatTabGroup } from '@angular/material/tabs'; import { BasePageComponent } from '../base-page/base-page.component'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts index cc651c5..457e64f 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts @@ -8,7 +8,7 @@ import Swal from 'sweetalert2'; import { MatTabsModule, MatTabGroup } from '@angular/material/tabs'; import { env } from '../../../environments/environment'; import { BasePageComponent } from '../base-page/base-page.component'; -import { Group, User, UserRep } from '../../models/user-management.api.models'; +import { Group, User, UserRep } from '../../services/api/api-models'; import { RepCreateFormComponent } from '../../components/forms/rep-create-form/rep-create-form.component'; import { MatDialog } from '@angular/material/dialog'; import { BaseTableComponent } from '../../components/tables/base-table/base-table.component'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.ts index d2091cd..531b7fd 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.ts @@ -6,7 +6,7 @@ import { GroupTableComponent } from '../../components/tables/group-table/group-t import { ModuleTableComponent } from '../../components/tables/module-table/module-table.component'; import { UserCreateFormComponent } from '../../components/forms/user-create-form/user-create-form.component'; import { BasePageComponent } from '../base-page/base-page.component'; -import { User } from '../../models/user-management.api.models'; +import { User } from '../../services/api/api-models'; import { firstValueFrom, forkJoin } from 'rxjs'; import Swal from 'sweetalert2'; import { env } from '../../../environments/environment' diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/models/user-management.api.models.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/api-models.ts similarity index 100% rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/models/user-management.api.models.ts rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/api-models.ts diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-management.api.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/api-service.ts similarity index 100% rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-management.api.service.ts rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/api-service.ts diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-group.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-group.service.ts index 10053b1..a14cdb7 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-group.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-group.service.ts @@ -1,7 +1,7 @@ import { Injectable, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { DirGroup, } from '../../models/user-management.api.models'; -import { ApiService } from './user-management.api.service'; +import { DirGroup, } from './api-models'; +import { ApiService } from './api-service'; import { Observable } from 'rxjs/internal/Observable'; import Swal from 'sweetalert2'; import { UrlService } from './url.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-user.service.ts index 47f489b..13e4840 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-user.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-user.service.ts @@ -1,7 +1,7 @@ import { Injectable, Inject } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; -import { DirUser } from '../../models/user-management.api.models'; -import { ApiService } from './user-management.api.service'; +import { DirUser } from './api-models'; +import { ApiService } from './api-service'; import { Observable } from 'rxjs/internal/Observable'; import { UrlService } from './url.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir.service.ts index 2f9a0ed..6067929 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir.service.ts @@ -1,7 +1,7 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs'; import { Inject, Injectable } from '@angular/core'; -import { DirUser } from '../../models/user-management.api.models'; +import { DirUser } from './api-models'; import { UrlService } from './url.service'; @Injectable({ diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group-of-user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group-of-user.service.ts index 309a2a6..7014e1f 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group-of-user.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group-of-user.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; -import { GroupOfUser } from '../../models/user-management.api.models'; -import { ApiService } from './user-management.api.service'; +import { GroupOfUser } from './api-models'; +import { ApiService } from './api-service'; import { Observable, firstValueFrom } from 'rxjs'; import { UrlService } from './url.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group.service.ts index 0573f1f..06b233a 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group.service.ts @@ -1,7 +1,7 @@ import { Injectable, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { DirGroup, Group, } from '../../models/user-management.api.models'; -import { ApiService } from './user-management.api.service'; +import { DirGroup, Group, } from './api-models'; +import { ApiService } from './api-service'; import { Observable } from 'rxjs/internal/Observable'; import { UrlService } from './url.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module-of-user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module-of-user.service.ts index 28b54ae..967f7a2 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module-of-user.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module-of-user.service.ts @@ -1,7 +1,7 @@ import { Injectable, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { ModuleOfUser } from '../../models/user-management.api.models'; -import { ApiService } from './user-management.api.service'; +import { ModuleOfUser } from './api-models'; +import { ApiService } from './api-service'; import { Observable, firstValueFrom } from 'rxjs'; import { UrlService } from './url.service'; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module.service.ts index 66d50fa..a4746aa 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module.service.ts @@ -1,7 +1,7 @@ import { Injectable, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { ApiService } from './user-management.api.service'; -import { Module } from '../../models/user-management.api.models'; +import { ApiService } from './api-service'; +import { Module } from './api-models'; import { UrlService } from './url.service'; @Injectable({ diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts index a6d9aba..bfe9da1 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from "@angular/core"; -import { UserRep } from "../../models/user-management.api.models"; -import { ApiService } from "./user-management.api.service"; +import { UserRep } from "./api-models"; +import { ApiService } from "./api-service"; import { HttpClient, HttpParams } from "@angular/common/http"; import { Observable } from "rxjs"; import { UrlService } from "./url.service"; diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user.service.ts index 333a6b9..291f518 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user.service.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user.service.ts @@ -1,7 +1,7 @@ import { Injectable, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { DirUser, User } from '../../models/user-management.api.models'; -import { ApiService } from './user-management.api.service'; +import { DirUser, User } from './api-models'; +import { ApiService } from './api-service'; import { Observable } from 'rxjs'; import { UrlService } from './url.service';