upgrade everything
This commit is contained in:
rubikscraft
parent
d507fcfaf0
commit
659a41cd28
|
|
@ -0,0 +1,10 @@
|
|||
root = true
|
||||
|
||||
[*]
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
|
||||
[*.{js,json,yml}]
|
||||
charset = utf-8
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
|
@ -1,3 +1,11 @@
|
|||
node_modules
|
||||
todo.txt
|
||||
yarn-error.log
|
||||
|
||||
.yarn/*
|
||||
!.yarn/patches
|
||||
!.yarn/releases
|
||||
!.yarn/plugins
|
||||
!.yarn/sdks
|
||||
!.yarn/versions
|
||||
.pnp.*
|
||||
|
|
|
|||
|
|
@ -18,7 +18,11 @@
|
|||
"label": "Start shared",
|
||||
"command": "yarn start",
|
||||
"options": {
|
||||
"cwd": "${cwd}/shared"
|
||||
"cwd": "${cwd}/shared",
|
||||
"shell": {
|
||||
"executable": "/bin/bash",
|
||||
"args": ["-i", "-c"]
|
||||
}
|
||||
},
|
||||
"group": "build"
|
||||
},
|
||||
|
|
@ -27,7 +31,11 @@
|
|||
"label": "Start backend",
|
||||
"command": "yarn start:dev",
|
||||
"options": {
|
||||
"cwd": "${cwd}/backend"
|
||||
"cwd": "${cwd}/backend",
|
||||
"shell": {
|
||||
"executable": "/bin/bash",
|
||||
"args": ["-i", "-c"]
|
||||
}
|
||||
},
|
||||
"group": "build"
|
||||
},
|
||||
|
|
@ -36,16 +44,24 @@
|
|||
"label": "Start frontend",
|
||||
"command": "yarn watch",
|
||||
"options": {
|
||||
"cwd": "${cwd}/frontend"
|
||||
"cwd": "${cwd}/frontend",
|
||||
"shell": {
|
||||
"executable": "/bin/bash",
|
||||
"args": ["-i", "-c"]
|
||||
}
|
||||
},
|
||||
"group": "build"
|
||||
},
|
||||
{
|
||||
"type": "shell",
|
||||
"label": "Start postgres",
|
||||
"command": "podman-compose -f ./dev.docker-compose.yml stop; podman-compose -f ./dev.docker-compose.yml up",
|
||||
"command": "yarn devdb:start",
|
||||
"options": {
|
||||
"cwd": "${cwd}/support"
|
||||
"cwd": "${cwd}",
|
||||
"shell": {
|
||||
"executable": "/bin/bash",
|
||||
"args": ["-i", "-c"]
|
||||
}
|
||||
},
|
||||
"group": "build"
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,3 @@
|
|||
undecided:
|
||||
- root-workspace-0b6124
|
||||
- "@skala/web-backend"
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
nodeLinker: node-modules
|
||||
|
||||
plugins:
|
||||
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
|
||||
spec: "@yarnpkg/plugin-version"
|
||||
|
||||
yarnPath: .yarn/releases/yarn-berry.cjs
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
"name": "picsur-backend",
|
||||
"private": false,
|
||||
"version": "0.3.0",
|
||||
"description": "Backend for Picsur",
|
||||
"license": "GPL-3.0",
|
||||
|
|
@ -23,62 +22,62 @@
|
|||
"dependencies": {
|
||||
"@fastify/helmet": "^9.1.0",
|
||||
"@fastify/multipart": "^7.1.0",
|
||||
"@fastify/static": "^6.4.0",
|
||||
"@nestjs/common": "^8.4.7",
|
||||
"@nestjs/config": "^2.1.0",
|
||||
"@nestjs/core": "^8.4.7",
|
||||
"@nestjs/jwt": "^8.0.1",
|
||||
"@nestjs/passport": "^8.2.2",
|
||||
"@nestjs/platform-fastify": "^8.4.7",
|
||||
"@nestjs/serve-static": "^2.2.2",
|
||||
"@nestjs/typeorm": "^8.1.4",
|
||||
"@fastify/static": "^6.5.0",
|
||||
"@nestjs/common": "^9.0.11",
|
||||
"@nestjs/config": "^2.2.0",
|
||||
"@nestjs/core": "^9.0.11",
|
||||
"@nestjs/jwt": "^9.0.0",
|
||||
"@nestjs/passport": "^9.0.0",
|
||||
"@nestjs/platform-fastify": "^9.0.11",
|
||||
"@nestjs/serve-static": "^3.0.0",
|
||||
"@nestjs/typeorm": "^9.0.1",
|
||||
"bcrypt": "^5.0.1",
|
||||
"bmp-img": "^1.1.0",
|
||||
"cors": "^2.8.5",
|
||||
"fastify-static": "^4.7.0",
|
||||
"file-type": "^17.1.2",
|
||||
"file-type": "^18.0.0",
|
||||
"ms": "^2.1.3",
|
||||
"p-timeout": "^5.1.0",
|
||||
"p-timeout": "^6.0.0",
|
||||
"passport": "^0.6.0",
|
||||
"passport-jwt": "^4.0.0",
|
||||
"passport-local": "^1.0.0",
|
||||
"passport-strategy": "^1.0.0",
|
||||
"pg": "^8.7.3",
|
||||
"pg": "^8.8.0",
|
||||
"picsur-shared": "*",
|
||||
"posix.js": "^0.1.1",
|
||||
"qoi-img": "^1.1.0",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
"rxjs": "^7.5.5",
|
||||
"rxjs": "^7.5.6",
|
||||
"sharp": "^0.30.7",
|
||||
"typeorm": "0.3.6",
|
||||
"zod": "^3.17.3"
|
||||
"typeorm": "0.3.7",
|
||||
"zod": "^3.18.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nestjs/cli": "^8.2.8",
|
||||
"@nestjs/schematics": "^8.0.11",
|
||||
"@nestjs/testing": "^8.4.7",
|
||||
"@nestjs/cli": "^9.0.0",
|
||||
"@nestjs/schematics": "^9.0.1",
|
||||
"@nestjs/testing": "^9.0.11",
|
||||
"@types/bcrypt": "^5.0.0",
|
||||
"@types/cors": "^2.8.12",
|
||||
"@types/ms": "^0.7.31",
|
||||
"@types/multer": "^1.4.7",
|
||||
"@types/node": "^18.0.0",
|
||||
"@types/node": "^18.7.13",
|
||||
"@types/passport-jwt": "^3.0.6",
|
||||
"@types/passport-local": "^1.0.34",
|
||||
"@types/passport-strategy": "^0.2.35",
|
||||
"@types/sharp": "^0.30.4",
|
||||
"@types/sharp": "^0.30.5",
|
||||
"@types/supertest": "^2.0.12",
|
||||
"@typescript-eslint/eslint-plugin": "^5.29.0",
|
||||
"@typescript-eslint/parser": "^5.29.0",
|
||||
"eslint": "^8.18.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.35.1",
|
||||
"@typescript-eslint/parser": "^5.35.1",
|
||||
"eslint": "^8.22.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"prettier": "^2.7.1",
|
||||
"source-map-support": "^0.5.21",
|
||||
"ts-loader": "^9.3.1",
|
||||
"ts-node": "^10.8.1",
|
||||
"tsconfig-paths": "^4.0.0",
|
||||
"typescript": "4.7.4",
|
||||
"webpack": "^5.73.0"
|
||||
"ts-node": "^10.9.1",
|
||||
"tsconfig-paths": "^4.1.0",
|
||||
"typescript": "4.8.2",
|
||||
"webpack": "^5.74.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import { Repository } from 'typeorm';
|
||||
import { ObjectLiteral, Repository } from 'typeorm';
|
||||
|
||||
// This is a function that returns an array of all available columns in a database table
|
||||
// It is used to fetch hidden columns from the database
|
||||
export function GetCols<T>(repository: Repository<T>): (keyof T)[] {
|
||||
export function GetCols<T extends ObjectLiteral>(repository: Repository<T>): (keyof T)[] {
|
||||
return repository.metadata.columns.map(
|
||||
(col) => col.propertyName,
|
||||
) as (keyof T)[];
|
||||
|
|
|
|||
|
|
@ -35,6 +35,25 @@ export class ImageController {
|
|||
private readonly userService: UsersService,
|
||||
) {}
|
||||
|
||||
@Head(':id')
|
||||
async headImage(
|
||||
@Res({ passthrough: true }) res: FastifyReply,
|
||||
@ImageFullIdParam() fullid: ImageFullId,
|
||||
) {
|
||||
if (fullid.type === 'original') {
|
||||
const fullmime = await this.imagesService.getOriginalMime(fullid.id);
|
||||
if (HasFailed(fullmime)) {
|
||||
this.logger.warn(fullmime.getReason());
|
||||
throw new NotFoundException('Could not find image');
|
||||
}
|
||||
|
||||
res.type(fullmime.mime);
|
||||
return;
|
||||
}
|
||||
|
||||
res.type(fullid.mime);
|
||||
}
|
||||
|
||||
@Get(':id')
|
||||
async getImage(
|
||||
// Usually passthrough is for manually sending the response,
|
||||
|
|
@ -68,25 +87,6 @@ export class ImageController {
|
|||
return image.data;
|
||||
}
|
||||
|
||||
@Head(':id')
|
||||
async headImage(
|
||||
@Res({ passthrough: true }) res: FastifyReply,
|
||||
@ImageFullIdParam() fullid: ImageFullId,
|
||||
) {
|
||||
if (fullid.type === 'original') {
|
||||
const fullmime = await this.imagesService.getOriginalMime(fullid.id);
|
||||
if (HasFailed(fullmime)) {
|
||||
this.logger.warn(fullmime.getReason());
|
||||
throw new NotFoundException('Could not find image');
|
||||
}
|
||||
|
||||
res.type(fullmime.mime);
|
||||
return;
|
||||
}
|
||||
|
||||
res.type(fullid.mime);
|
||||
}
|
||||
|
||||
@Get('meta/:id')
|
||||
@Returns(ImageMetaResponse)
|
||||
async getImageMeta(@ImageIdParam() id: string): Promise<ImageMetaResponse> {
|
||||
|
|
|
|||
|
|
@ -148,7 +148,9 @@ export class SharpWrapper {
|
|||
},
|
||||
);
|
||||
|
||||
const result = await pTimeout(finishPromise, this.instance_timeout);
|
||||
const result = await pTimeout(finishPromise, {
|
||||
milliseconds: this.instance_timeout,
|
||||
});
|
||||
|
||||
this.logger.verbose(
|
||||
`Worker ${this.workerID} finished in ${result.processingTime}ms`,
|
||||
|
|
@ -174,7 +176,7 @@ export class SharpWrapper {
|
|||
});
|
||||
});
|
||||
|
||||
await pTimeout(waitReadyPromise, this.instance_timeout);
|
||||
await pTimeout(waitReadyPromise, { milliseconds: this.instance_timeout });
|
||||
return true;
|
||||
} catch (error) {
|
||||
return Fail(FT.Internal, error);
|
||||
|
|
|
|||
|
|
@ -33,10 +33,8 @@
|
|||
"styles": ["src/styles.scss"],
|
||||
"scripts": [],
|
||||
"allowedCommonJsDependencies": [
|
||||
"validator",
|
||||
"debug",
|
||||
"buffer/",
|
||||
"sha.js"
|
||||
"ngx-auto-unsubscribe-decorator",
|
||||
"moment"
|
||||
],
|
||||
"optimization": true,
|
||||
"webWorkerTsConfig": "tsconfig.worker.json"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
"private": false,
|
||||
"name": "picsur-frontend",
|
||||
"version": "0.3.0",
|
||||
"description": "Frontend for Picsur",
|
||||
|
|
@ -14,43 +13,43 @@
|
|||
"purge": "rm -rf dist && rm -rf node_modules && rm -rf .angular"
|
||||
},
|
||||
"dependencies": {
|
||||
"@angular/animations": "^14.0.3",
|
||||
"@angular/cdk": "^14.0.3",
|
||||
"@angular/common": "^14.0.3",
|
||||
"@angular/compiler": "^14.0.3",
|
||||
"@angular/core": "^14.0.3",
|
||||
"@angular/forms": "^14.0.3",
|
||||
"@angular/material": "^14.0.3",
|
||||
"@angular/platform-browser": "^14.0.3",
|
||||
"@angular/platform-browser-dynamic": "^14.0.3",
|
||||
"@angular/router": "^14.0.3",
|
||||
"@ng-web-apis/common": "^2.0.0",
|
||||
"@ng-web-apis/resize-observer": "^1.0.3",
|
||||
"@angular/animations": "^14.2.0",
|
||||
"@angular/cdk": "^14.2.0",
|
||||
"@angular/common": "^14.2.0",
|
||||
"@angular/compiler": "^14.2.0",
|
||||
"@angular/core": "^14.2.0",
|
||||
"@angular/forms": "^14.2.0",
|
||||
"@angular/material": "^14.2.0",
|
||||
"@angular/platform-browser": "^14.2.0",
|
||||
"@angular/platform-browser-dynamic": "^14.2.0",
|
||||
"@angular/router": "^14.2.0",
|
||||
"@ng-web-apis/common": "^2.0.1",
|
||||
"@ng-web-apis/resize-observer": "^2.0.0",
|
||||
"@ngui/common": "^1.0.0",
|
||||
"bootstrap": "^5.1.3",
|
||||
"bootstrap": "^5.2.0",
|
||||
"fuse.js": "^6.6.2",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"moment": "^2.29.3",
|
||||
"moment": "^2.29.4",
|
||||
"ngx-auto-unsubscribe-decorator": "^1.1.0",
|
||||
"ngx-dropzone": "^3.1.0",
|
||||
"ngx-moment": "^6.0.2",
|
||||
"picsur-shared": "*",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rxjs": "~7.5.5",
|
||||
"rxjs": "~7.5.6",
|
||||
"tslib": "^2.4.0",
|
||||
"zod": "^3.17.3",
|
||||
"zone.js": "~0.11.6"
|
||||
"zod": "^3.18.0",
|
||||
"zone.js": "~0.11.8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "14.0.3",
|
||||
"@angular/cli": "^14.0.3",
|
||||
"@angular/compiler-cli": "^14.0.3",
|
||||
"@angular-devkit/build-angular": "14.2.0",
|
||||
"@angular/cli": "^14.2.0",
|
||||
"@angular/compiler-cli": "^14.2.0",
|
||||
"@fontsource/material-icons": "^4.5.4",
|
||||
"@fontsource/material-icons-outlined": "^4.5.4",
|
||||
"@fontsource/roboto": "^4.5.7",
|
||||
"@types/node": "^18.0.0",
|
||||
"@fontsource/roboto": "^4.5.8",
|
||||
"@types/node": "^18.7.13",
|
||||
"@types/resize-observer-browser": "^0.1.7",
|
||||
"@types/validator": "^13.7.3",
|
||||
"typescript": "4.7.4"
|
||||
"@types/validator": "^13.7.5",
|
||||
"typescript": "4.8.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
25
package.json
25
package.json
|
|
@ -7,27 +7,24 @@
|
|||
"frontend"
|
||||
],
|
||||
"scripts": {
|
||||
"devdb:start": "podman-compose -f ./dev/docker-compose.yml up -d",
|
||||
"devdb:stop": "podman-compose -f ./dev/docker-compose.yml down",
|
||||
"devdb:start": "docker-compose -f ./support/dev.docker-compose.yml up -d",
|
||||
"devdb:stop": "docker-compose -f ./support/dev.docker-compose.yml down",
|
||||
"devdb:restart": "docker-compose -f ./support/dev.docker-compose.yml restart",
|
||||
"devdb:remove": "docker-compose -f ./support/dev.docker-compose.yml down --rmi all --volumes",
|
||||
"build": "./support/build.sh",
|
||||
"setversion": "./support/setversion.sh",
|
||||
"purge": "rm -rf ./node_modules",
|
||||
"purge-all": "./support/purge-all.sh"
|
||||
},
|
||||
"resolutions": {
|
||||
"fastify": "^4.1.0",
|
||||
"fastify-static": "npm:@fastify/static",
|
||||
"fastify-formbody": "npm:@fastify/formbody",
|
||||
"minimist": "npm:minimist-lite"
|
||||
},
|
||||
"dependencies": {
|
||||
"fastify": "^4.1.0",
|
||||
"fastify-formbody": "npm:@fastify/formbody",
|
||||
"fastify-static": "npm:@fastify/static",
|
||||
"minimist": "npm:minimist-lite"
|
||||
"fastify": "^4.5.2",
|
||||
"fastify-static": "npm:@fastify/static@*",
|
||||
"fastify-formbody": "npm:@fastify/formbody@*",
|
||||
"minimist": "npm:minimist-lite@*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"prettier": "^2.7.1",
|
||||
"prettier-plugin-sh": "^0.12.3"
|
||||
}
|
||||
"prettier-plugin-sh": "^0.12.8"
|
||||
},
|
||||
"packageManager": "yarn@3.2.2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
"private": false,
|
||||
"name": "picsur-shared",
|
||||
"version": "0.3.0",
|
||||
"description": "Shared libraries for Picsur",
|
||||
|
|
@ -10,11 +9,11 @@
|
|||
"main": "./dist/index.js",
|
||||
"dependencies": {
|
||||
"tsc-watch": "^5.0.3",
|
||||
"zod": "^3.17.3"
|
||||
"zod": "^3.18.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^18.0.0",
|
||||
"typescript": "4.7.4"
|
||||
"@types/node": "^18.7.13",
|
||||
"typescript": "4.8.2"
|
||||
},
|
||||
"scripts": {
|
||||
"clean": "rm -rf ./dist",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
PACKAGE_URL="ghcr.io/rubikscraft/picsur"
|
||||
|
||||
# Go to this script
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
|
|
@ -8,13 +10,13 @@ VERSION=$(cat ../package.json | grep version | head -1 | awk -F: '{ print $2 }'
|
|||
|
||||
echo "Building version $VERSION"
|
||||
|
||||
docker build -t "ghcr.io/rubikscraft/picsur:$VERSION" -t "ghcr.io/rubikscraft/picsur:latest" -f ./picsur.Dockerfile ..
|
||||
docker build -t "$PACKAGE_URL:$VERSION" -t "$PACKAGE_URL:latest" -f ./skala.Dockerfile ..
|
||||
|
||||
echo "Done"
|
||||
|
||||
echo "Pushing to ghcr.io"
|
||||
echo "Pushing to registry"
|
||||
|
||||
docker push "ghcr.io/rubikscraft/picsur:$VERSION"
|
||||
docker push "ghcr.io/rubikscraft/picsur:latest"
|
||||
docker push "$PACKAGE_URL:$VERSION"
|
||||
docker push "$PACKAGE_URL:latest"
|
||||
|
||||
echo "Done"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM ghcr.io/rubikscraft/node-docker:1.0.0
|
||||
FROM node:18.8
|
||||
|
||||
# Sorry for the humongous docker container this generates
|
||||
# Maybe I'll trim it down some day
|
||||
|
|
|
|||
|
|
@ -1,23 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
yarn workspace shared purge
|
||||
yarn workspace backend purge
|
||||
yarn workspace frontend purge
|
||||
|
||||
yarn devdb:purge
|
||||
yarn purge
|
||||
|
||||
(
|
||||
cd shared
|
||||
yarn purge
|
||||
)
|
||||
|
||||
(
|
||||
cd backend
|
||||
yarn purge
|
||||
)
|
||||
|
||||
(
|
||||
cd frontend
|
||||
yarn purge
|
||||
)
|
||||
|
||||
(
|
||||
cd support
|
||||
podman-compose -f ./dev.docker-compose.yml down
|
||||
)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ fi
|
|||
|
||||
SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
||||
UPDATE_VERSION="yarn version --no-commit-hooks --no-git-tag-version --new-version"
|
||||
UPDATE_VERSION="yarn version"
|
||||
|
||||
cd $SCRIPT_PATH/..
|
||||
$UPDATE_VERSION $VERSION
|
||||
|
|
|
|||
Loading…
Reference in New Issue