move dto files
This commit is contained in:
parent
dfe2237a1b
commit
bf2fa9e771
|
@ -4,5 +4,5 @@ import { MultiPartFileDto } from './multipart.dto';
|
||||||
// A validation class for form based file upload of an image
|
// A validation class for form based file upload of an image
|
||||||
export class ImageUploadDto {
|
export class ImageUploadDto {
|
||||||
@IsMultiPartFile()
|
@IsMultiPartFile()
|
||||||
image: MultiPartFileDto;
|
image: MultiPartFileDto
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ import {
|
||||||
Router
|
Router
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { PRouteData } from './models/picsur-routes';
|
import { PRouteData } from './models/dto/picsur-routes.dto';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from './models/picsur-routes';
|
import { PRoutes } from './models/dto/picsur-routes.dto';
|
||||||
import { ErrorsRouteModule } from './routes/errors/errors.module';
|
import { ErrorsRouteModule } from './routes/errors/errors.module';
|
||||||
import { ProcessingRouteModule } from './routes/processing/processing.module';
|
import { ProcessingRouteModule } from './routes/processing/processing.module';
|
||||||
import { SettingsRouteModule } from './routes/settings/settings.module';
|
import { SettingsRouteModule } from './routes/settings/settings.module';
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { Clipboard } from '@angular/cdk/clipboard';
|
import { Clipboard } from '@angular/cdk/clipboard';
|
||||||
import { Component, Input } from '@angular/core';
|
import { Component, Input } from '@angular/core';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { EUser } from 'picsur-shared/dist/entities/user.entity';
|
import { EUser } from 'picsur-shared/dist/entities/user.entity';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { PermissionService } from 'src/app/services/api/permission.service';
|
import { PermissionService } from 'src/app/services/api/permission.service';
|
||||||
import { UserService } from 'src/app/services/api/user.service';
|
import { UserService } from 'src/app/services/api/user.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
|
@ -8,7 +8,7 @@ import {
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { isPermissionsArray } from 'picsur-shared/dist/validators/permissions.validator';
|
import { isPermissionsArray } from 'picsur-shared/dist/validators/permissions.validator';
|
||||||
import { PRouteData } from '../models/picsur-routes';
|
import { PRouteData } from '../models/dto/picsur-routes.dto';
|
||||||
import { PermissionService } from '../services/api/permission.service';
|
import { PermissionService } from '../services/api/permission.service';
|
||||||
import { Logger } from '../services/logger/logger.service';
|
import { Logger } from '../services/logger/logger.service';
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { MultiPartRequest } from './multi-part-request';
|
import { MultiPartRequest } from './multi-part-request.dto';
|
||||||
|
|
||||||
export class ImageUploadRequest implements MultiPartRequest {
|
export class ImageUploadRequest implements MultiPartRequest {
|
||||||
constructor(private image: File) {}
|
constructor(private image: File) {}
|
|
@ -1,6 +1,6 @@
|
||||||
import { FormControl } from '@angular/forms';
|
import { FormControl } from '@angular/forms';
|
||||||
import { Fail, Failable } from 'picsur-shared/dist/types';
|
import { Fail, Failable } from 'picsur-shared/dist/types';
|
||||||
import { UserPassModel } from '../dto/userpass.dto';
|
import { UserPassModel } from '../forms-dto/userpass.dto';
|
||||||
import {
|
import {
|
||||||
CreatePasswordError,
|
CreatePasswordError,
|
||||||
CreateUsernameError,
|
CreateUsernameError,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { FormControl } from '@angular/forms';
|
import { FormControl } from '@angular/forms';
|
||||||
import { Fail, Failable } from 'picsur-shared/dist/types';
|
import { Fail, Failable } from 'picsur-shared/dist/types';
|
||||||
import { UserPassModel } from '../dto/userpass.dto';
|
import { UserPassModel } from '../forms-dto/userpass.dto';
|
||||||
import { Compare } from '../validators/compare.validator';
|
import { Compare } from '../validators/compare.validator';
|
||||||
import {
|
import {
|
||||||
CreatePasswordError, CreateUsernameError, PasswordValidators, UsernameValidators
|
CreatePasswordError, CreateUsernameError, PasswordValidators, UsernameValidators
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { FormControl } from '@angular/forms';
|
import { FormControl } from '@angular/forms';
|
||||||
import Fuse from 'fuse.js';
|
import Fuse from 'fuse.js';
|
||||||
import { BehaviorSubject, Subscription } from 'rxjs';
|
import { BehaviorSubject, Subscription } from 'rxjs';
|
||||||
import { RoleModel } from '../dto/role.dto';
|
import { RoleModel } from '../forms-dto/role.dto';
|
||||||
import { RoleNameValidators } from '../validators/role.validator';
|
import { RoleNameValidators } from '../validators/role.validator';
|
||||||
import { CreateUsernameError } from '../validators/user.validator';
|
import { CreateUsernameError } from '../validators/user.validator';
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { FormControl } from '@angular/forms';
|
||||||
import Fuse from 'fuse.js';
|
import Fuse from 'fuse.js';
|
||||||
import { ERole } from 'picsur-shared/dist/entities/role.entity';
|
import { ERole } from 'picsur-shared/dist/entities/role.entity';
|
||||||
import { BehaviorSubject, Subscription } from 'rxjs';
|
import { BehaviorSubject, Subscription } from 'rxjs';
|
||||||
import { FullUserModel } from '../dto/fulluser.dto';
|
import { FullUserModel } from '../forms-dto/fulluser.dto';
|
||||||
import {
|
import {
|
||||||
CreatePasswordError,
|
CreatePasswordError,
|
||||||
CreateUsernameError,
|
CreateUsernameError,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { E401Component } from './401.component';
|
import { E401Component } from './401.component';
|
||||||
import { E404Component } from './404.component';
|
import { E404Component } from './404.component';
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { ProcessingViewMetadata } from 'src/app/models/processing-view-metadata';
|
import { ProcessingViewMetadata } from 'src/app/models/dto/processing-view-metadata.dto';
|
||||||
import { ImageService } from 'src/app/services/api/image.service';
|
import { ImageService } from 'src/app/services/api/image.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { ProcessingComponent } from './processing.component';
|
import { ProcessingComponent } from './processing.component';
|
||||||
|
|
||||||
const routes: PRoutes = [
|
const routes: PRoutes = [
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { SettingsGeneralComponent } from './settings-general.component';
|
import { SettingsGeneralComponent } from './settings-general.component';
|
||||||
|
|
||||||
const routes: PRoutes = [
|
const routes: PRoutes = [
|
||||||
|
|
|
@ -6,8 +6,8 @@ import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
|
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
|
||||||
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { UpdateRoleControl } from 'src/app/models/forms/updaterole.control';
|
import { UpdateRoleControl } from 'src/app/models/forms/updaterole.control';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
|
||||||
import { PermissionService } from 'src/app/services/api/permission.service';
|
import { PermissionService } from 'src/app/services/api/permission.service';
|
||||||
import { RolesService } from 'src/app/services/api/roles.service';
|
import { RolesService } from 'src/app/services/api/roles.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
|
@ -6,7 +6,7 @@ import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { ERole } from 'picsur-shared/dist/entities/role.entity';
|
import { ERole } from 'picsur-shared/dist/entities/role.entity';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
|
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { RolesService } from 'src/app/services/api/roles.service';
|
import { RolesService } from 'src/app/services/api/roles.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { SettingsRolesEditComponent } from './settings-roles-edit/settings-roles-edit.component';
|
import { SettingsRolesEditComponent } from './settings-roles-edit/settings-roles-edit.component';
|
||||||
import { SettingsRolesComponent } from './settings-roles.component';
|
import { SettingsRolesComponent } from './settings-roles.component';
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { PermissionGuard } from 'src/app/guards/permission.guard';
|
import { PermissionGuard } from 'src/app/guards/permission.guard';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { SidebarResolverService } from 'src/app/services/sidebar-resolver/sidebar-resolver.service';
|
import { SidebarResolverService } from 'src/app/services/sidebar-resolver/sidebar-resolver.service';
|
||||||
import { SettingsGeneralRouteModule } from './general/settings-general.module';
|
import { SettingsGeneralRouteModule } from './general/settings-general.module';
|
||||||
import { SettingsRolesRouteModule } from './roles/settings-roles.module';
|
import { SettingsRolesRouteModule } from './roles/settings-roles.module';
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { Component, Inject, OnInit } from '@angular/core';
|
import { Component, Inject, OnInit } from '@angular/core';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { PermissionService } from 'src/app/services/api/permission.service';
|
import { PermissionService } from 'src/app/services/api/permission.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
|
||||||
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { SysPreferenceBaseResponse } from 'picsur-shared/dist/dto/api/pref.dto';
|
import { SysPreferenceBaseResponse } from 'picsur-shared/dist/dto/api/pref.dto';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { SysprefService as SysPrefService } from 'src/app/services/api/syspref.service';
|
import { SysprefService as SysPrefService } from 'src/app/services/api/syspref.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { SettingsSysprefComponent } from './settings-syspref.component';
|
import { SettingsSysprefComponent } from './settings-syspref.component';
|
||||||
|
|
||||||
const routes: PRoutes = [
|
const routes: PRoutes = [
|
||||||
|
|
|
@ -5,7 +5,7 @@ import { SysPreference, SysPrefValueType } from 'picsur-shared/dist/dto/sysprefe
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { Subject, throttleTime } from 'rxjs';
|
import { Subject, throttleTime } from 'rxjs';
|
||||||
import { SysPreferenceFriendlyNames } from 'src/app/i18n/syspref.i18n';
|
import { SysPreferenceFriendlyNames } from 'src/app/i18n/syspref.i18n';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { SysprefService } from 'src/app/services/api/syspref.service';
|
import { SysprefService } from 'src/app/services/api/syspref.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,8 @@ import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
|
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
|
||||||
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { UpdateUserControl } from 'src/app/models/forms/updateuser.control';
|
import { UpdateUserControl } from 'src/app/models/forms/updateuser.control';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
|
||||||
import { RolesService } from 'src/app/services/api/roles.service';
|
import { RolesService } from 'src/app/services/api/roles.service';
|
||||||
import { UserManageService } from 'src/app/services/api/usermanage.service';
|
import { UserManageService } from 'src/app/services/api/usermanage.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
|
@ -5,7 +5,7 @@ import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { EUser } from 'picsur-shared/dist/entities/user.entity';
|
import { EUser } from 'picsur-shared/dist/entities/user.entity';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { BehaviorSubject, Subject, throttleTime } from 'rxjs';
|
import { BehaviorSubject, Subject, throttleTime } from 'rxjs';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { SnackBarType } from "src/app/models/dto/snack-bar-type.dto";
|
||||||
import { UserManageService } from 'src/app/services/api/usermanage.service';
|
import { UserManageService } from 'src/app/services/api/usermanage.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { SettingsUsersEditComponent } from './settings-users-edit/settings-users-edit.component';
|
import { SettingsUsersEditComponent } from './settings-users-edit/settings-users-edit.component';
|
||||||
import { SettingsUsersComponent } from './settings-users.component';
|
import { SettingsUsersComponent } from './settings-users.component';
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ import { NgxDropzoneChangeEvent } from 'ngx-dropzone';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { PermissionService } from 'src/app/services/api/permission.service';
|
import { PermissionService } from 'src/app/services/api/permission.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
import { ProcessingViewMetadata } from '../../models/processing-view-metadata';
|
import { ProcessingViewMetadata } from '../../models/dto/processing-view-metadata.dto';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
templateUrl: './upload.component.html',
|
templateUrl: './upload.component.html',
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { UploadComponent } from './upload.component';
|
import { UploadComponent } from './upload.component';
|
||||||
|
|
||||||
const routes: PRoutes = [
|
const routes: PRoutes = [
|
||||||
|
|
|
@ -3,8 +3,8 @@ import { Router } from '@angular/router';
|
||||||
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { UserPassModel } from 'src/app/models/dto/userpass.dto';
|
import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { UserPassModel } from 'src/app/models/forms-dto/userpass.dto';
|
||||||
import { PermissionService } from 'src/app/services/api/permission.service';
|
import { PermissionService } from 'src/app/services/api/permission.service';
|
||||||
import { UserService } from 'src/app/services/api/user.service';
|
import { UserService } from 'src/app/services/api/user.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
|
@ -3,8 +3,8 @@ import { Router } from '@angular/router';
|
||||||
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { HasFailed } from 'picsur-shared/dist/types';
|
import { HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { UserPassModel } from 'src/app/models/dto/userpass.dto';
|
import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
|
||||||
import { SnackBarType } from 'src/app/models/snack-bar-type';
|
import { UserPassModel } from 'src/app/models/forms-dto/userpass.dto';
|
||||||
import { PermissionService } from 'src/app/services/api/permission.service';
|
import { PermissionService } from 'src/app/services/api/permission.service';
|
||||||
import { UserService } from 'src/app/services/api/user.service';
|
import { UserService } from 'src/app/services/api/user.service';
|
||||||
import { UtilService } from 'src/app/util/util.service';
|
import { UtilService } from 'src/app/util/util.service';
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { PermissionGuard } from 'src/app/guards/permission.guard';
|
import { PermissionGuard } from 'src/app/guards/permission.guard';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { LoginComponent } from './login/login.component';
|
import { LoginComponent } from './login/login.component';
|
||||||
import { RegisterComponent } from './register/register.component';
|
import { RegisterComponent } from './register/register.component';
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||||
import { PermissionGuard } from 'src/app/guards/permission.guard';
|
import { PermissionGuard } from 'src/app/guards/permission.guard';
|
||||||
import { PRoutes } from 'src/app/models/picsur-routes';
|
import { PRoutes } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
import { ViewComponent } from './view.component';
|
import { ViewComponent } from './view.component';
|
||||||
|
|
||||||
const routes: PRoutes = [
|
const routes: PRoutes = [
|
||||||
|
|
|
@ -4,8 +4,8 @@ import { ApiResponse, ApiSuccessResponse } from 'picsur-shared/dist/dto/api/api.
|
||||||
import { AsyncFailable, Fail, HasFailed } from 'picsur-shared/dist/types';
|
import { AsyncFailable, Fail, HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { strictValidate } from 'picsur-shared/dist/util/validate';
|
import { strictValidate } from 'picsur-shared/dist/util/validate';
|
||||||
import { Subject } from 'rxjs';
|
import { Subject } from 'rxjs';
|
||||||
import { ApiError } from 'src/app/models/api-error';
|
import { ApiError } from 'src/app/models/dto/api-error.dto';
|
||||||
import { MultiPartRequest } from '../../models/multi-part-request';
|
import { MultiPartRequest } from '../../models/dto/multi-part-request.dto';
|
||||||
import { KeyService } from './key.service';
|
import { KeyService } from './key.service';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
||||||
import { ImageMetaResponse } from 'picsur-shared/dist/dto/api/image.dto';
|
import { ImageMetaResponse } from 'picsur-shared/dist/dto/api/image.dto';
|
||||||
import { EImage } from 'picsur-shared/dist/entities/image.entity';
|
import { EImage } from 'picsur-shared/dist/entities/image.entity';
|
||||||
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { ImageUploadRequest } from '../../models/image-upload-request';
|
import { ImageUploadRequest } from '../../models/dto/image-upload-request.dto';
|
||||||
import { ApiService } from './api.service';
|
import { ApiService } from './api.service';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { plainToClass } from 'class-transformer';
|
||||||
import { InfoResponse } from 'picsur-shared/dist/dto/api/info.dto';
|
import { InfoResponse } from 'picsur-shared/dist/dto/api/info.dto';
|
||||||
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { BehaviorSubject } from 'rxjs';
|
import { BehaviorSubject } from 'rxjs';
|
||||||
import { ServerInfo } from '../../models/server-info';
|
import { ServerInfo } from '../../models/dto/server-info.dto';
|
||||||
import { ApiService } from './api.service';
|
import { ApiService } from './api.service';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
|
|
|
@ -13,7 +13,7 @@ import {
|
||||||
} from 'picsur-shared/dist/dto/api/roles.dto';
|
} from 'picsur-shared/dist/dto/api/roles.dto';
|
||||||
import { ERole } from 'picsur-shared/dist/entities/role.entity';
|
import { ERole } from 'picsur-shared/dist/entities/role.entity';
|
||||||
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { RoleModel } from 'src/app/models/dto/role.dto';
|
import { RoleModel } from 'src/app/models/forms-dto/role.dto';
|
||||||
import { ApiService } from './api.service';
|
import { ApiService } from './api.service';
|
||||||
import { CacheService } from './cache.service';
|
import { CacheService } from './cache.service';
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ import {
|
||||||
} from 'picsur-shared/dist/dto/api/usermanage.dto';
|
} from 'picsur-shared/dist/dto/api/usermanage.dto';
|
||||||
import { EUser } from 'picsur-shared/dist/entities/user.entity';
|
import { EUser } from 'picsur-shared/dist/entities/user.entity';
|
||||||
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
|
||||||
import { FullUserModel } from 'src/app/models/dto/fulluser.dto';
|
import { FullUserModel } from 'src/app/models/forms-dto/fulluser.dto';
|
||||||
import { ApiService } from './api.service';
|
import { ApiService } from './api.service';
|
||||||
import { CacheService } from './cache.service';
|
import { CacheService } from './cache.service';
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { ComponentPortal, Portal } from '@angular/cdk/portal';
|
import { ComponentPortal, Portal } from '@angular/cdk/portal';
|
||||||
import { Injectable, Injector } from '@angular/core';
|
import { Injectable, Injector } from '@angular/core';
|
||||||
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
|
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
|
||||||
import { PRouteData } from 'src/app/models/picsur-routes';
|
import { PRouteData } from 'src/app/models/dto/picsur-routes.dto';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'any',
|
providedIn: 'any',
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
|
||||||
import { SnackBarType } from '../models/snack-bar-type';
|
import { SnackBarType } from '../models/dto/snack-bar-type.dto';
|
||||||
import { ApiService } from '../services/api/api.service';
|
import { ApiService } from '../services/api/api.service';
|
||||||
import { UtilService } from './util.service';
|
import { UtilService } from './util.service';
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { SnackBarType } from '../models/snack-bar-type';
|
import { SnackBarType } from '../models/dto/snack-bar-type.dto';
|
||||||
import {
|
import {
|
||||||
ConfirmDialogComponent,
|
ConfirmDialogComponent,
|
||||||
DialogData
|
DialogData
|
||||||
|
|
Loading…
Reference in a new issue