mirror of
https://github.com/CaramelFur/Picsur.git
synced 2026-08-30 11:56:50 +02:00
refactor names in shared
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { PrefValueType } from 'picsur-shared/dist/dto/preferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
|
||||
import { generateRandomString } from 'picsur-shared/dist/util/random';
|
||||
import { EarlyJwtConfigService } from '../../config/early/earlyjwt.config.service';
|
||||
|
||||
|
||||
@@ -3,18 +3,18 @@ import { InjectRepository } from '@nestjs/typeorm';
|
||||
import {
|
||||
DecodedSysPref,
|
||||
PrefValueType,
|
||||
PrefValueTypeStrings,
|
||||
PrefValueTypeStrings
|
||||
} from 'picsur-shared/dist/dto/preferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
|
||||
import { AsyncFailable, Fail, HasFailed } from 'picsur-shared/dist/types';
|
||||
import { Repository } from 'typeorm';
|
||||
import {
|
||||
SysPreferenceList,
|
||||
SysPreferenceValueTypes,
|
||||
SysPreferenceValueTypes
|
||||
} from '../../models/dto/syspreferences.dto';
|
||||
import {
|
||||
ESysPreferenceBackend,
|
||||
ESysPreferenceSchema,
|
||||
ESysPreferenceSchema
|
||||
} from '../../models/entities/syspreference.entity';
|
||||
import { FallBackMutex } from '../../models/util/FallBackMutex';
|
||||
import { PreferenceCommonService } from './preferencecommon.service';
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
PrefValueType,
|
||||
PrefValueTypeStrings
|
||||
} from 'picsur-shared/dist/dto/preferences.dto';
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
|
||||
import { AsyncFailable, Fail, HasFailed } from 'picsur-shared/dist/types';
|
||||
import { Repository } from 'typeorm';
|
||||
import {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import * as bcrypt from 'bcrypt';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
|
||||
import {
|
||||
AsyncFailable,
|
||||
Fail,
|
||||
|
||||
@@ -18,9 +18,9 @@ export class MainExceptionFilter implements ExceptionFilter {
|
||||
|
||||
catch(exception: unknown, host: ArgumentsHost) {
|
||||
if (exception instanceof Error) {
|
||||
MainExceptionFilter.logger.error(exception.message, exception.stack);
|
||||
MainExceptionFilter.logger.warn(exception.message, exception.stack);
|
||||
} else {
|
||||
MainExceptionFilter.logger.error(exception);
|
||||
MainExceptionFilter.logger.warn(exception);
|
||||
}
|
||||
|
||||
const ctx = host.switchToHttp();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PrefValueTypeStrings } from 'picsur-shared/dist/dto/preferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
|
||||
|
||||
export type SysPreferences = SysPreference[];
|
||||
export const SysPreferenceList: string[] = Object.values(SysPreference);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PrefValueTypeStrings } from 'picsur-shared/dist/dto/preferences.dto';
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
|
||||
|
||||
export type UsrPreferences = UsrPreference[];
|
||||
export const UsrPreferenceList: string[] = Object.values(UsrPreference);
|
||||
|
||||
@@ -2,7 +2,7 @@ import {
|
||||
Controller, Get,
|
||||
Request
|
||||
} from '@nestjs/common';
|
||||
import { UserInfoResponse } from 'picsur-shared/dist/dto/api/usermanage.dto';
|
||||
import { UserInfoResponse } from 'picsur-shared/dist/dto/api/user-manage.dto';
|
||||
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
|
||||
import { RequiredPermissions } from '../../../decorators/permissions.decorator';
|
||||
import { ReqUserID } from '../../../decorators/request-user.decorator';
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
Get,
|
||||
InternalServerErrorException,
|
||||
Logger,
|
||||
Post,
|
||||
Post
|
||||
} from '@nestjs/common';
|
||||
import {
|
||||
GetSpecialUsersResponse,
|
||||
@@ -17,8 +17,8 @@ import {
|
||||
UserListRequest,
|
||||
UserListResponse,
|
||||
UserUpdateRequest,
|
||||
UserUpdateResponse,
|
||||
} from 'picsur-shared/dist/dto/api/usermanage.dto';
|
||||
UserUpdateResponse
|
||||
} from 'picsur-shared/dist/dto/api/user-manage.dto';
|
||||
import { HasFailed } from 'picsur-shared/dist/types';
|
||||
import { UsersService } from '../../../collections/userdb/userdb.service';
|
||||
import { RequiredPermissions } from '../../../decorators/permissions.decorator';
|
||||
@@ -27,7 +27,7 @@ import { Permission } from '../../../models/dto/permissions.dto';
|
||||
import {
|
||||
ImmutableUsersList,
|
||||
LockedLoginUsersList,
|
||||
UndeletableUsersList,
|
||||
UndeletableUsersList
|
||||
} from '../../../models/dto/specialusers.dto';
|
||||
import { EUserBackend2EUser } from '../../../models/transformers/user.transformer';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/syspreferences.dto';
|
||||
import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.dto';
|
||||
|
||||
export const SysPreferenceFriendlyNames: {
|
||||
[key in SysPreference]: string;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usrpreferences.dto';
|
||||
import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.dto';
|
||||
|
||||
export const UsrPreferenceFriendlyNames: {
|
||||
[key in UsrPreference]: string;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FormControl } from '@angular/forms';
|
||||
import { UserCreateRequest, UserUpdateRequest } from 'picsur-shared/dist/dto/api/usermanage.dto';
|
||||
import { UserCreateRequest, UserUpdateRequest } from 'picsur-shared/dist/dto/api/user-manage.dto';
|
||||
import {
|
||||
CreatePasswordError,
|
||||
CreateUsernameError,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { ImageLinks } from 'picsur-shared/dist/dto/imagelinks.dto';
|
||||
import { ImageLinks } from 'picsur-shared/dist/dto/image-links.dto';
|
||||
import { HasFailed } from 'picsur-shared/dist/types';
|
||||
import { UUIDRegex } from 'picsur-shared/dist/util/common-regex';
|
||||
import { ImageService } from 'src/app/services/api/image.service';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { ImageMetaResponse } from 'picsur-shared/dist/dto/api/image.dto';
|
||||
import { ImageLinks } from 'picsur-shared/dist/dto/imagelinks.dto';
|
||||
import { ImageLinks } from 'picsur-shared/dist/dto/image-links.dto';
|
||||
import { EImage } from 'picsur-shared/dist/entities/image.entity';
|
||||
import { AsyncFailable } from 'picsur-shared/dist/types';
|
||||
import { Open } from 'picsur-shared/dist/types/failable';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { AllPermissionsResponse } from 'picsur-shared/dist/dto/api/info.dto';
|
||||
import { SpecialRolesResponse } from 'picsur-shared/dist/dto/api/roles.dto';
|
||||
import { GetSpecialUsersResponse } from 'picsur-shared/dist/dto/api/usermanage.dto';
|
||||
import { GetSpecialUsersResponse } from 'picsur-shared/dist/dto/api/user-manage.dto';
|
||||
import { Open } from 'picsur-shared/dist/types';
|
||||
import { CacheService } from '../storage/cache.service';
|
||||
import { ApiService } from './api.service';
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
UserListResponse,
|
||||
UserUpdateRequest,
|
||||
UserUpdateResponse
|
||||
} from 'picsur-shared/dist/dto/api/usermanage.dto';
|
||||
} from 'picsur-shared/dist/dto/api/user-manage.dto';
|
||||
import { EUser } from 'picsur-shared/dist/entities/user.entity';
|
||||
import { AsyncFailable, Open } from 'picsur-shared/dist/types';
|
||||
import { ApiService } from './api.service';
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
import { createZodDto } from '../../util/create-zod-dto';
|
||||
import { IsPosInt } from '../../validators/positive-int.validator';
|
||||
import { IsStringList } from '../../validators/string-list.validator';
|
||||
import { EntityIDObjectSchema } from '../idobject.dto';
|
||||
import { EntityIDObjectSchema } from '../id-object.dto';
|
||||
|
||||
// UserList
|
||||
export const UserListRequestSchema = z.object({
|
||||
@@ -6,7 +6,7 @@ export enum ImageMime {
|
||||
TIFF = 'image/tiff',
|
||||
BMP = 'image/bmp',
|
||||
ICO = 'image/x-icon',
|
||||
QOI = 'image/qoi',
|
||||
QOI = 'image/x-qoi',
|
||||
}
|
||||
|
||||
export enum AnimMime {
|
||||
|
||||
Reference in New Issue
Block a user