move dto files

backend/src/models/requests/imageroute.dto.ts

@@ -4,5 +4,5 @@ import { MultiPartFileDto } from './multipart.dto';
 // A validation class for form based file upload of an image
 export class ImageUploadDto {
   @IsMultiPartFile()
-  image: MultiPartFileDto;
+  image: MultiPartFileDto
 }

frontend/src/app/app.component.ts

@@ -9,7 +9,7 @@ import {
   Router
 } from '@angular/router';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
-import { PRouteData } from './models/picsur-routes';
+import { PRouteData } from './models/dto/picsur-routes.dto';
 
 @Component({
   selector: 'app-root',

frontend/src/app/app.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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 { ProcessingRouteModule } from './routes/processing/processing.module';
 import { SettingsRouteModule } from './routes/settings/settings.module';

frontend/src/app/components/copyfield/copyfield.component.ts

@@ -1,6 +1,6 @@
 import { Clipboard } from '@angular/cdk/clipboard';
 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';
 
 @Component({

frontend/src/app/components/header/header.component.ts

@@ -4,7 +4,7 @@ import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { EUser } from 'picsur-shared/dist/entities/user.entity';
 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 { UserService } from 'src/app/services/api/user.service';
 import { UtilService } from 'src/app/util/util.service';

frontend/src/app/guards/permission.guard.ts

@@ -8,7 +8,7 @@ import {
 } from '@angular/router';
 import { HasFailed } from 'picsur-shared/dist/types';
 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 { Logger } from '../services/logger/logger.service';
 

frontend/src/app/models/dto/image-upload-request.dto.ts

@@ -1,4 +1,4 @@
-import { MultiPartRequest } from './multi-part-request';
+import { MultiPartRequest } from './multi-part-request.dto';
 
 export class ImageUploadRequest implements MultiPartRequest {
   constructor(private image: File) {}

frontend/src/app/models/forms/login.control.ts

@@ -1,6 +1,6 @@
 import { FormControl } from '@angular/forms';
 import { Fail, Failable } from 'picsur-shared/dist/types';
-import { UserPassModel } from '../dto/userpass.dto';
+import { UserPassModel } from '../forms-dto/userpass.dto';
 import {
   CreatePasswordError,
   CreateUsernameError,

frontend/src/app/models/forms/register.control.ts

@@ -1,6 +1,6 @@
 import { FormControl } from '@angular/forms';
 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 {
   CreatePasswordError, CreateUsernameError, PasswordValidators, UsernameValidators

frontend/src/app/models/forms/updaterole.control.ts

@@ -1,7 +1,7 @@
 import { FormControl } from '@angular/forms';
 import Fuse from 'fuse.js';
 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 { CreateUsernameError } from '../validators/user.validator';
 

frontend/src/app/models/forms/updateuser.control.ts

@@ -2,7 +2,7 @@ import { FormControl } from '@angular/forms';
 import Fuse from 'fuse.js';
 import { ERole } from 'picsur-shared/dist/entities/role.entity';
 import { BehaviorSubject, Subscription } from 'rxjs';
-import { FullUserModel } from '../dto/fulluser.dto';
+import { FullUserModel } from '../forms-dto/fulluser.dto';
 import {
   CreatePasswordError,
   CreateUsernameError,

frontend/src/app/routes/errors/errors.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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 { E404Component } from './404.component';
 

frontend/src/app/routes/processing/processing.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 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 { UtilService } from 'src/app/util/util.service';
 

frontend/src/app/routes/processing/processing.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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';
 
 const routes: PRoutes = [

frontend/src/app/routes/settings/general/settings-general.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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';
 
 const routes: PRoutes = [

frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts

@@ -6,8 +6,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
 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 { SnackBarType } from 'src/app/models/snack-bar-type';
 import { PermissionService } from 'src/app/services/api/permission.service';
 import { RolesService } from 'src/app/services/api/roles.service';
 import { UtilService } from 'src/app/util/util.service';

frontend/src/app/routes/settings/roles/settings-roles.component.ts

@@ -6,7 +6,7 @@ import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { ERole } from 'picsur-shared/dist/entities/role.entity';
 import { HasFailed } from 'picsur-shared/dist/types';
 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 { UtilService } from 'src/app/util/util.service';
 

frontend/src/app/routes/settings/roles/settings-roles.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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 { SettingsRolesComponent } from './settings-roles.component';
 

frontend/src/app/routes/settings/settings.routing.module.ts

@@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 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 { SettingsGeneralRouteModule } from './general/settings-general.module';
 import { SettingsRolesRouteModule } from './roles/settings-roles.module';

frontend/src/app/routes/settings/sidebar/settings-sidebar.component.ts

@@ -1,7 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 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';
 
 @Component({

frontend/src/app/routes/settings/syspref/settings-syspref.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
 import { SysPreferenceBaseResponse } from 'picsur-shared/dist/dto/api/pref.dto';
 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 { UtilService } from 'src/app/util/util.service';
 

frontend/src/app/routes/settings/syspref/settings-syspref.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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';
 
 const routes: PRoutes = [

frontend/src/app/routes/settings/syspref/syspref-option/settings-syspref-option.component.ts

@@ -5,7 +5,7 @@ import { SysPreference, SysPrefValueType } from 'picsur-shared/dist/dto/sysprefe
 import { HasFailed } from 'picsur-shared/dist/types';
 import { Subject, throttleTime } from 'rxjs';
 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 { UtilService } from 'src/app/util/util.service';
 

frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts

@@ -6,8 +6,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
 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 { SnackBarType } from 'src/app/models/snack-bar-type';
 import { RolesService } from 'src/app/services/api/roles.service';
 import { UserManageService } from 'src/app/services/api/usermanage.service';
 import { UtilService } from 'src/app/util/util.service';

frontend/src/app/routes/settings/users/settings-users.component.ts

@@ -5,7 +5,7 @@ import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
 import { EUser } from 'picsur-shared/dist/entities/user.entity';
 import { HasFailed } from 'picsur-shared/dist/types';
 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 { UtilService } from 'src/app/util/util.service';
 

frontend/src/app/routes/settings/users/settings-users.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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 { SettingsUsersComponent } from './settings-users.component';
 

frontend/src/app/routes/upload/upload.component.ts

@@ -5,7 +5,7 @@ import { NgxDropzoneChangeEvent } from 'ngx-dropzone';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { PermissionService } from 'src/app/services/api/permission.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({
   templateUrl: './upload.component.html',

frontend/src/app/routes/upload/upload.routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 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';
 
 const routes: PRoutes = [

frontend/src/app/routes/user/login/login.component.ts

@@ -3,8 +3,8 @@ import { Router } from '@angular/router';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
-import { UserPassModel } from 'src/app/models/dto/userpass.dto';
-import { SnackBarType } from 'src/app/models/snack-bar-type';
+import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
+import { UserPassModel } from 'src/app/models/forms-dto/userpass.dto';
 import { PermissionService } from 'src/app/services/api/permission.service';
 import { UserService } from 'src/app/services/api/user.service';
 import { UtilService } from 'src/app/util/util.service';

frontend/src/app/routes/user/register/register.component.ts

@@ -3,8 +3,8 @@ import { Router } from '@angular/router';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 import { HasFailed } from 'picsur-shared/dist/types';
-import { UserPassModel } from 'src/app/models/dto/userpass.dto';
-import { SnackBarType } from 'src/app/models/snack-bar-type';
+import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
+import { UserPassModel } from 'src/app/models/forms-dto/userpass.dto';
 import { PermissionService } from 'src/app/services/api/permission.service';
 import { UserService } from 'src/app/services/api/user.service';
 import { UtilService } from 'src/app/util/util.service';

frontend/src/app/routes/user/user.routing.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 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 { RegisterComponent } from './register/register.component';
 

frontend/src/app/routes/view/view.routing.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
 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';
 
 const routes: PRoutes = [

frontend/src/app/services/api/api.service.ts

@@ -4,8 +4,8 @@ import { ApiResponse, ApiSuccessResponse } from 'picsur-shared/dist/dto/api/api.
 import { AsyncFailable, Fail, HasFailed } from 'picsur-shared/dist/types';
 import { strictValidate } from 'picsur-shared/dist/util/validate';
 import { Subject } from 'rxjs';
-import { ApiError } from 'src/app/models/api-error';
-import { MultiPartRequest } from '../../models/multi-part-request';
+import { ApiError } from 'src/app/models/dto/api-error.dto';
+import { MultiPartRequest } from '../../models/dto/multi-part-request.dto';
 import { KeyService } from './key.service';
 
 @Injectable({

frontend/src/app/services/api/image.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { ImageMetaResponse } from 'picsur-shared/dist/dto/api/image.dto';
 import { EImage } from 'picsur-shared/dist/entities/image.entity';
 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';
 
 @Injectable({

frontend/src/app/services/api/info.service.ts

@@ -3,7 +3,7 @@ import { plainToClass } from 'class-transformer';
 import { InfoResponse } from 'picsur-shared/dist/dto/api/info.dto';
 import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
 import { BehaviorSubject } from 'rxjs';
-import { ServerInfo } from '../../models/server-info';
+import { ServerInfo } from '../../models/dto/server-info.dto';
 import { ApiService } from './api.service';
 
 @Injectable({

frontend/src/app/services/api/roles.service.ts

@@ -13,7 +13,7 @@ import {
 } from 'picsur-shared/dist/dto/api/roles.dto';
 import { ERole } from 'picsur-shared/dist/entities/role.entity';
 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 { CacheService } from './cache.service';
 

frontend/src/app/services/api/usermanage.service.ts

@@ -14,7 +14,7 @@ import {
 } from 'picsur-shared/dist/dto/api/usermanage.dto';
 import { EUser } from 'picsur-shared/dist/entities/user.entity';
 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 { CacheService } from './cache.service';
 

frontend/src/app/services/sidebar-resolver/sidebar-resolver.service.ts

@@ -1,7 +1,7 @@
 import { ComponentPortal, Portal } from '@angular/cdk/portal';
 import { Injectable, Injector } from '@angular/core';
 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({
   providedIn: 'any',

frontend/src/app/util/apierror.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 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 { UtilService } from './util.service';
 

frontend/src/app/util/util.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Router } from '@angular/router';
-import { SnackBarType } from '../models/snack-bar-type';
+import { SnackBarType } from '../models/dto/snack-bar-type.dto';
 import {
   ConfirmDialogComponent,
   DialogData