reorganizing

backend/src/app.module.ts

@@ -5,8 +5,8 @@ import { ImageModule } from './routes/image/imageroute.module';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import Config from './env';
 import { DemoManagerModule } from './managers/demo/demomanager.module';
-import { EImageBackend } from './backenddto/image.entity';
-import { EUserBackend } from './backenddto/user.entity';
+import { EImageBackend } from './models/entities/image.entity';
+import { EUserBackend } from './models/entities/user.entity';
 
 @Module({
   imports: [

backend/src/collections/imagedb/imagedb.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { EImageBackend } from '../../backenddto/image.entity';
+import { EImageBackend } from '../../models/entities/image.entity';
 import { ImageDBService } from './imagedb.service';
 import { MimesService } from './mimes.service';
 

backend/src/collections/imagedb/imagedb.service.ts

@@ -11,7 +11,7 @@ import {
 import { SupportedMime } from 'picsur-shared/dist/dto/mimes.dto';
 import { GetCols } from '../collectionutils';
 import { plainToClass } from 'class-transformer';
-import { EImageBackend } from '../../backenddto/image.entity';
+import { EImageBackend } from '../../models/entities/image.entity';
 
 @Injectable()
 export class ImageDBService {

backend/src/collections/userdb/userdb.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { EUserBackend } from '../../backenddto/user.entity';
+import { EUserBackend } from '../../models/entities/user.entity';
 import { UsersService } from './userdb.service';
 
 @Module({

backend/src/collections/userdb/userdb.service.ts

@@ -9,7 +9,7 @@ import {
   HasSuccess,
 } from 'picsur-shared/dist/types';
 import { Repository } from 'typeorm';
-import { EUserBackend } from '../../backenddto/user.entity';
+import { EUserBackend } from '../../models/entities/user.entity';
 import { GetCols } from '../collectionutils';
 
 @Injectable()

backend/src/decorators/multipart.decorator.ts

@@ -10,7 +10,7 @@ import { FastifyRequest } from 'fastify';
 import { Multipart, MultipartFields, MultipartFile } from 'fastify-multipart';
 import { Newable } from 'picsur-shared/dist/types';
 import Config from '../env';
-import { MultiPartFieldDto, MultiPartFileDto } from '../backenddto/multipart.dto';
+import { MultiPartFieldDto, MultiPartFileDto } from '../models/dto/multipart.dto';
 
 const logger = new Logger('MultiPart');
 export interface MPFile {

backend/src/main.ts

@@ -1,4 +1,4 @@
-import { Res, ValidationPipe } from '@nestjs/common';
+import { ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
 import {
   FastifyAdapter,
@@ -7,7 +7,7 @@ import {
 import { AppModule } from './app.module';
 
 import * as multipart from 'fastify-multipart';
-import { MainExceptionFilter } from './layers/http-exception/http-exception.filter';
+import { MainExceptionFilter } from './layers/httpexception/httpexception.filter';
 import { SuccessInterceptor } from './layers/success/success.interceptor';
 import Config from './env';
 

backend/src/managers/imagemanager/imagemanager.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { fileTypeFromBuffer, FileTypeResult } from 'file-type';
 import { FullMime } from 'picsur-shared/dist/dto/mimes.dto';
 import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
-import { EImageBackend } from '../../backenddto/image.entity';
+import { EImageBackend } from '../../models/entities/image.entity';
 import { ImageDBService } from '../../collections/imagedb/imagedb.service';
 import { MimesService } from '../../collections/imagedb/mimes.service';
 

backend/src/routes/api/auth/admin.guard.ts

@@ -6,7 +6,7 @@ import {
 } from '@nestjs/common';
 import { plainToClass } from 'class-transformer';
 import { validate } from 'class-validator';
-import { EUserBackend } from '../../../backenddto/user.entity';
+import { EUserBackend } from '../../../models/entities/user.entity';
 
 @Injectable()
 export class AdminGuard implements CanActivate {

backend/src/routes/api/auth/auth.controller.ts

@@ -9,7 +9,7 @@ import {
   NotFoundException,
   InternalServerErrorException,
 } from '@nestjs/common';
-import { LocalAuthGuard } from './local-auth.guard';
+import { LocalAuthGuard } from './localauth.guard';
 import { AuthService } from './auth.service';
 import { JwtAuthGuard } from './jwt.guard';
 import { AdminGuard } from './admin.guard';

backend/src/routes/api/auth/auth.module.ts

@@ -1,13 +1,11 @@
 import {
   Logger,
-  MiddlewareConsumer,
   Module,
-  NestModule,
   OnModuleInit,
 } from '@nestjs/common';
 import { PassportModule } from '@nestjs/passport';
 import { AuthService } from './auth.service';
-import { LocalStrategy } from './local.strategy';
+import { LocalAuthStrategy } from './localauth.strategy';
 import { AuthController } from './auth.controller';
 import { JwtModule } from '@nestjs/jwt';
 import { JwtStrategy } from './jwt.strategy';
@@ -23,7 +21,7 @@ import Config from '../../../env';
       signOptions: { expiresIn: Config.jwt.expiresIn },
     }),
   ],
-  providers: [AuthService, LocalStrategy, JwtStrategy],
+  providers: [AuthService, LocalAuthStrategy, JwtStrategy],
   controllers: [AuthController],
 })
 export class AuthModule implements OnModuleInit {

backend/src/routes/api/auth/auth.service.ts

@@ -5,7 +5,7 @@ import { instanceToPlain, plainToClass } from 'class-transformer';
 import { validate } from 'class-validator';
 import { JwtDataDto } from 'picsur-shared/dist/dto/auth.dto';
 import { AsyncFailable, HasFailed, Fail } from 'picsur-shared/dist/types';
-import { EUserBackend } from '../../../backenddto/user.entity';
+import { EUserBackend } from '../../../models/entities/user.entity';
 import { UsersService } from '../../../collections/userdb/userdb.service';
 
 @Injectable()

backend/src/routes/api/auth/authrequest.ts

@@ -1,5 +1,5 @@
 import { FastifyRequest } from 'fastify';
-import { EUserBackend } from '../../../backenddto/user.entity';
+import { EUserBackend } from '../../../models/entities/user.entity';
 
 export default interface AuthFasityRequest extends FastifyRequest {
   user: EUserBackend;

backend/src/routes/api/auth/jwt.strategy.ts

@@ -5,7 +5,7 @@ import { validate } from 'class-validator';
 import { plainToClass } from 'class-transformer';
 import Config from '../../../env';
 import { JwtDataDto } from 'picsur-shared/dist/dto/auth.dto';
-import { EUserBackend } from '../../../backenddto/user.entity';
+import { EUserBackend } from '../../../models/entities/user.entity';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {

backend/src/routes/api/auth/localauth.strategy.ts

@@ -3,10 +3,10 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
-import { EUserBackend } from '../../../backenddto/user.entity';
+import { EUserBackend } from '../../../models/entities/user.entity';
 
 @Injectable()
-export class LocalStrategy extends PassportStrategy(Strategy, 'local') {
+export class LocalAuthStrategy extends PassportStrategy(Strategy, 'local') {
   constructor(private authService: AuthService) {
     super();
   }

backend/src/routes/image/imageroute.controller.ts

@@ -13,8 +13,8 @@ import { FastifyReply, FastifyRequest } from 'fastify';
 import { HasFailed } from 'picsur-shared/dist/types';
 import { MultiPart } from '../../decorators/multipart.decorator';
 import { ImageManagerService } from '../../managers/imagemanager/imagemanager.service';
-import { ImageUploadDto } from '../../backenddto/imageroute.dto';
 import { isHash } from 'class-validator';
+import { ImageUploadDto } from '../../models/dto/imageroute.dto';
 @Controller('i')
 export class ImageController {
   constructor(private readonly imagesService: ImageManagerService) {}

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

@@ -4,9 +4,9 @@ import { SnackBarType } from 'src/app/models/snack-bar-type';
 import { UtilService } from 'src/app/util/util.service';
 
 @Component({
-  selector: 'copy-field',
-  templateUrl: './copy-field.component.html',
-  styleUrls: ['./copy-field.component.scss'],
+  selector: 'copyfield',
+  templateUrl: './copyfield.component.html',
+  styleUrls: ['./copyfield.component.scss'],
 })
 export class CopyFieldComponent {
   // Two paramets: name, value

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

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { CopyFieldComponent } from './copy-field.component';
+import { CopyFieldComponent } from './copyfield.component';
 import { MatInputModule } from '@angular/material/input';
 import { MatIconModule } from '@angular/material/icon';
 import { MatButtonModule } from '@angular/material/button';

frontend/src/app/router/router.module.ts

@@ -8,7 +8,7 @@ import { ApiModule } from '../api/api.module';
 import { PageNotFoundModule } from '../components/pagenotfound/pagenotfound.module';
 import { PageNotFoundComponent } from '../components/pagenotfound/pagenotfound.component';
 import { ViewComponent } from '../routes/view/view.component';
-import { CopyFieldModule } from '../components/copy-field/copy-field.module';
+import { CopyFieldModule } from '../components/copyfield/copyfield.module';
 import { MatButtonModule } from '@angular/material/button';
 import { UtilModule } from '../util/util.module';
 import { LoginComponent } from '../routes/login/login.component';

frontend/src/app/routes/view/view.component.html

@@ -10,19 +10,19 @@
       </div>
 
       <div class="col-12">
-        <copy-field label="Image URL" [value]="imageUrl"></copy-field>
+        <copyfield label="Image URL" [value]="imageUrl"></copyfield>
       </div>
       <div class="col-md-6 col-12">
-        <copy-field label="Markdown" [value]="imageLinks.markdown"></copy-field>
+        <copyfield label="Markdown" [value]="imageLinks.markdown"></copyfield>
       </div>
       <div class="col-md-6 col-12">
-        <copy-field label="HTML" [value]="imageLinks.html"></copy-field>
+        <copyfield label="HTML" [value]="imageLinks.html"></copyfield>
       </div>
       <div class="col-md-6 col-12">
-        <copy-field label="BBCode" [value]="imageLinks.bbcode"></copy-field>
+        <copyfield label="BBCode" [value]="imageLinks.bbcode"></copyfield>
       </div>
       <div class="col-md-6 col-12">
-        <copy-field label="Rst" [value]="imageLinks.rst"></copy-field>
+        <copyfield label="Rst" [value]="imageLinks.rst"></copyfield>
       </div>
       <div class="col-12">
         <button mat-raised-button color="accent" (click)="goBackHome()">

shared/src/entities/syspreference.entity.ts

@@ -0,0 +1,12 @@
+import { IsNotEmpty, IsOptional } from 'class-validator';
+
+export class ESysPreference {
+  @IsOptional()
+  id?: number;
+
+  @IsNotEmpty()
+  name: string;
+
+  @IsNotEmpty()
+  value: string;
+}