update to yarn workspaces and turbo

This commit is contained in:
einhornimmond 2025-04-28 10:15:49 +02:00
parent 8b331f1274
commit 5173edbb39
242 changed files with 19192 additions and 931 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
.project
*.log
*.bak
.turbo
/node_modules/*
messages.pot
nbproject

View File

@ -1 +0,0 @@
v18.20

View File

@ -2,14 +2,13 @@
"name": "admin",
"description": "Administration Interface for Gradido",
"main": "index.js",
"author": "Moriz Wahl",
"author": "Gradido Academy - https://www.gradido.net",
"version": "2.5.1",
"license": "Apache-2.0",
"scripts": {
"start": "node run/server.js",
"dev": "vite",
"build": "vite build",
"serve": "vite preview",
"start": "vite preview",
"postbuild": "find build -type f -regex '.*\\.\\(html\\|js\\|css\\|svg\\|json\\)' -exec gzip -9 -k {} +",
"lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",
"stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'",
@ -20,34 +19,25 @@
"locales": "scripts/sort.sh"
},
"dependencies": {
"@babel/core": "^7.15.8",
"@babel/eslint-parser": "^7.24.8",
"@babel/node": "^7.15.8",
"@babel/preset-env": "^7.15.8",
"@iconify/json": "^2.2.228",
"@vitejs/plugin-vue": "3.2.0",
"@popperjs/core": "^2.11.8",
"@vitejs/plugin-vue": "^5.2.3",
"@vue/apollo-composable": "^4.0.2",
"@vue/apollo-option": "^4.0.0",
"@vue/compat": "3.4.31",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/compat": "3.5.13",
"apollo-boost": "^0.4.9",
"babel-core": "7.0.0-bridge.0",
"babel-plugin-component": "^1.1.1",
"babel-preset-env": "^1.7.0",
"babel-preset-vue": "^2.0.2",
"bootstrap": "^5.3.3",
"bootstrap-vue-next": "0.26.8",
"date-fns": "^2.29.3",
"dotenv-webpack": "^7.0.3",
"express": "^4.17.1",
"graphql": "^16.9.0",
"graphql": "^15.10.1",
"graphql-tag": "^2.12.6",
"identity-obj-proxy": "^3.0.0",
"portal-vue": "3.0.0",
"qrcanvas-vue": "3.0.0",
"regenerator-runtime": "^0.13.9",
"sass": "^1.77.8",
"vite": "3.2.10",
"unplugin-icons": "^0.19.0",
"unplugin-vue-components": "^0.27.3",
"vite": "^5.4.14",
"vite-plugin-commonjs": "^0.10.1",
"vue": "3.5.13",
"vue-apollo": "3.1.2",
@ -63,49 +53,48 @@
"@intlify/eslint-plugin-vue-i18n": "^1.4.0",
"@vitest/coverage-v8": "^2.0.5",
"@vue/compiler-sfc": "^3.4.32",
"@vue/test-utils": "^2.4.6",
"babel-plugin-transform-require-context": "^0.1.1",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/test-utils": "^2.4.6",
"config-schema": "*",
"cross-env": "^7.0.3",
"eslint": "8.57.0",
"eslint-config-prettier": "8.10.0",
"eslint-config-standard": "^16.0.3",
"eslint-loader": "^4.0.2",
"dotenv-webpack": "^7.0.3",
"eslint": "8.57.1",
"eslint-config-prettier": "^10.1.1",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-n": "^16",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-promise": "^5.1.1",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "8.7.1",
"gradido-config": "../config",
"joi": "^17.13.3",
"jsdom": "^25.0.0",
"mock-apollo-client": "^1.2.1",
"postcss": "^8.4.8",
"postcss-html": "^1.3.0",
"postcss-scss": "^4.0.3",
"prettier": "^3.3.3",
"stylelint": "16.7.0",
"prettier": "^3.5.3",
"sass": "^1.77.8",
"stylelint": "16.13.0",
"stylelint-config-recommended-vue": "1.5.0",
"stylelint-config-standard-scss": "13.1.0",
"unplugin-icons": "^0.19.0",
"unplugin-vue-components": "^0.27.3",
"vite-plugin-environment": "^1.1.3",
"vite-plugin-graphql-loader": "^4.0.4",
"vitest": "^2.0.5",
"vitest-canvas-mock": "^0.3.3"
"vitest-canvas-mock": "^0.3.3",
"webpack": "^5"
},
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 10"
],
"nodemonConfig": {
"ignore": [
"**/*.spec.js"
]
},
"resolutions": {
"strip-ansi": "6.0.1",
"string-width": "4.2.2",
"wrap-ansi": "7.0.0"
},
"engines": {
"node": ">=18"
}
}

View File

@ -30,8 +30,8 @@ if (process.env.ADMIN_HOSTING === 'nodejs') {
const environment = {
NODE_ENV: process.env.NODE_ENV,
DEBUG: process.env.NODE_ENV !== 'production' ?? false,
PRODUCTION: process.env.NODE_ENV === 'production' ?? false,
DEBUG: process.env.NODE_ENV !== 'production',
PRODUCTION: process.env.NODE_ENV === 'production',
}
// const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? undefined
@ -48,14 +48,14 @@ const endpoints = {
}
const debug = {
DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' ?? false,
DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true',
}
const humhub = {
HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true' || false,
HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true',
HUMHUB_API_URL: process.env.HUMHUB_API_URL ?? COMMUNITY_URL + '/community/',
}
const OPENAI_ACTIVE = process.env.OPENAI_ACTIVE === 'true' ?? false
const OPENAI_ACTIVE = process.env.OPENAI_ACTIVE === 'true'
const CONFIG = {
...version,

View File

@ -10,7 +10,7 @@ const {
NODE_ENV,
OPENAI_ACTIVE,
PRODUCTION,
} = require('gradido-config/build/src/commonSchema.js')
} = require('config-schema')
const Joi = require('joi')
module.exports = Joi.object({

12
admin/turbo.json Normal file
View File

@ -0,0 +1,12 @@
{
"extends": ["//"],
"tasks": {
"stylelint": {
},
"locales": {
},
"lint": {
"dependsOn": ["stylelint", "locales"]
}
}
}

View File

@ -7,7 +7,11 @@ import IconsResolve from 'unplugin-icons/resolver'
import { BootstrapVueNextResolver } from 'bootstrap-vue-next'
import EnvironmentPlugin from 'vite-plugin-environment'
import schema from './src/config/schema'
import { validate, browserUrls } from 'gradido-config/build/src/index.js'
import { execSync } from 'node:child_process'
import { existsSync, constants } from 'node:fs'
import { validate, browserUrls } from 'config-schema'
import path from 'node:path'
import dotenv from 'dotenv'
@ -15,8 +19,6 @@ dotenv.config() // load env vars from .env
const CONFIG = require('./src/config')
const path = require('path')
export default defineConfig(async ({ command }) => {
const { vitePluginGraphqlLoader } = await import('vite-plugin-graphql-loader')
if (command === 'serve') {
@ -24,6 +26,9 @@ export default defineConfig(async ({ command }) => {
} else {
CONFIG.ADMIN_HOSTING = 'nginx'
}
if (existsSync('../.git', constants.F_OK)) {
CONFIG.BUILD_COMMIT = execSync('git rev-parse HEAD').toString().trim()
}
validate(schema, CONFIG)
// make sure that all urls used in browser have the same protocol to prevent mixed content errors
validate(browserUrls, [
@ -70,7 +75,7 @@ export default defineConfig(async ({ command }) => {
compiler: 'vue3',
}),
EnvironmentPlugin({
BUILD_COMMIT: null,
BUILD_COMMIT: CONFIG.BUILD_COMMIT ?? undefined,
PORT: CONFIG.ADMIN_MODULE_PORT ?? null, // null,
COMMUNITY_HOST: CONFIG.ADMIN_MODULE_HOST ?? null, // null,
COMMUNITY_URL: CONFIG.COMMUNITY_URL ?? null,

View File

@ -1 +0,0 @@
v18.20.7

View File

@ -1,10 +1,10 @@
{
"name": "gradido-backend",
"name": "backend",
"version": "2.5.1",
"description": "Gradido unified backend providing an API-Service for Gradido Transactions",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/backend",
"author": "Ulf Gebhardt",
"author": "Gradido Academy - https://www.gradido.net",
"license": "Apache-2.0",
"private": false,
"scripts": {
@ -25,17 +25,16 @@
"await-semaphore": "^0.1.3",
"axios": "^0.21.1",
"class-validator": "^0.13.1",
"config-schema": "*",
"cors": "^2.8.5",
"cross-env": "^7.0.3",
"database": "*",
"decimal.js-light": "^2.5.1",
"dotenv": "^10.0.0",
"email-templates": "^10.0.1",
"email-templates": "^12.0.2",
"express": "^4.17.1",
"express-slow-down": "^2.0.1",
"gradido-config": "file:../config",
"gradido-database": "file:../database",
"graphql": "^15.5.1",
"graphql-parse-resolve-info": "^4.13.0",
"graphql": "^15.10.1",
"graphql-request": "5.0.0",
"graphql-type-json": "0.3.2",
"helmet": "^5.1.1",
@ -43,7 +42,7 @@
"joi": "^17.13.3",
"jose": "^4.14.4",
"lodash.clonedeep": "^4.5.0",
"log4js": "^6.4.6",
"log4js": "^6.7.1",
"mysql2": "^2.3.0",
"nodemailer": "^6.6.5",
"openai": "^4.87.3",
@ -52,19 +51,20 @@
"reflect-metadata": "^0.1.13",
"sodium-native": "^3.4.1",
"type-graphql": "^1.1.1",
"typeorm": "^0.3.16",
"typed-rest-client": "^1.8.11",
"uuid": "^8.3.2",
"workerpool": "^9.2.0",
"xregexp": "^5.1.1"
},
"devDependencies": {
"@anatine/esbuild-decorators": "^0.2.19",
"@eslint-community/eslint-plugin-eslint-comments": "^3.2.1",
"@types/email-templates": "^10.0.1",
"@types/email-templates": "^10.0.4",
"@types/express": "^4.17.12",
"@types/faker": "^5.5.9",
"@types/i18n": "^0.13.4",
"@types/jest": "^27.0.2",
"@types/joi": "^17.2.3",
"@types/jest": "^29.5.14",
"@types/lodash.clonedeep": "^4.5.6",
"@types/node": "^17.0.21",
"@types/nodemailer": "^6.4.4",
@ -74,27 +74,27 @@
"@typescript-eslint/parser": "^5.62.0",
"apollo-server-testing": "^2.25.2",
"eslint": "^8.57.1",
"eslint-config-prettier": "^8.8.0",
"eslint-config-prettier": "^10.1.1",
"eslint-config-standard": "^17.0.0",
"eslint-import-resolver-typescript": "^3.5.4",
"eslint-import-resolver-typescript": "^4.2.2",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-security": "^1.7.1",
"eslint-plugin-type-graphql": "^1.0.0",
"faker": "^5.5.3",
"graphql-tag": "^2.12.6",
"jest": "^27.2.4",
"jest": "^29.5.14",
"klicktipp-api": "^1.0.2",
"mkdirp": "^3.0.1",
"ncp": "^2.0.0",
"nodemon": "^2.0.7",
"prettier": "^2.8.7",
"prettier": "^3.5.3",
"ts-jest": "^27.0.5",
"ts-node": "^10.9.2",
"tsconfig-paths": "^3.14.0",
"tsconfig-paths": "^4.1.1",
"typescript": "^4.9.5"
},
"nodemonConfig": {
@ -103,6 +103,6 @@
]
},
"engines": {
"node": ">=14"
"node": ">=18"
}
}

View File

@ -3,8 +3,8 @@
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
import { Connection } from '@dbTools/typeorm'
import { Transaction as DbTransaction } from '@entity/Transaction'
import { Connection } from '@typeorm/connection'
import { Transaction as DbTransaction } from 'database'
import { Decimal } from 'decimal.js-light'
import { cleanDB, testEnvironment } from '@test/helpers'

View File

@ -1,4 +1,4 @@
import { Transaction as DbTransaction } from '@entity/Transaction'
import { Transaction as DbTransaction } from 'database'
import { gql, GraphQLClient } from 'graphql-request'
import { CONFIG } from '@/config'

View File

@ -4,7 +4,7 @@
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-return */
import { User as DbUser } from '@entity/User'
import { User as DbUser } from 'database'
// import { createTestClient } from 'apollo-server-testing'
// import { createGmsUser } from '@/apis/gms/GmsClient'

View File

@ -1,4 +1,4 @@
import { User as dbUser } from '@entity/User'
import { User as dbUser } from 'database'
import { PublishNameLogic } from '@/data/PublishName.logic'
// import { GmsPublishLocationType } from '@/graphql/enum/GmsPublishLocationType'

View File

@ -1,5 +1,5 @@
import { IsNull, Not } from '@dbTools/typeorm'
import { User } from '@entity/User'
import { IsNull, Not } from 'typeorm'
import { User } from 'database'
import { CONFIG } from '@/config'
import { LogError } from '@/server/LogError'

View File

@ -1,4 +1,4 @@
import { ProjectBranding } from '@entity/ProjectBranding'
import { ProjectBranding } from 'database'
import { SignJWT } from 'jose'
import { IRequestOptions, IRestResponse, RestClient } from 'typed-rest-client'

View File

@ -1,5 +1,5 @@
import { User } from '@entity/User'
import { UserContact } from '@entity/UserContact'
import { User } from 'database'
import { UserContact } from 'database'
import { IRestResponse } from 'typed-rest-client'
import { GetUser } from '@/apis/humhub/model/GetUser'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { isHumhubUserIdenticalToDbUser } from '@/apis/humhub/compareHumhubUserDbUser'
import { GetUser } from '@/apis/humhub/model/GetUser'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { Account } from './model/Account'
import { GetUser } from './model/GetUser'

View File

@ -1,5 +1,4 @@
import { AbstractLoggingView } from '@logging/AbstractLogging.view'
import { AbstractLoggingView } from 'database'
import { Account } from '@/apis/humhub/model/Account'
export class AccountLoggingView extends AbstractLoggingView {

View File

@ -1,5 +1,4 @@
import { AbstractLoggingView } from '@logging/AbstractLogging.view'
import { AbstractLoggingView } from 'database'
import { PostUser } from '@/apis/humhub/model/PostUser'
import { AccountLoggingView } from './AccountLogging.view'

View File

@ -1,5 +1,4 @@
import { AbstractLoggingView } from '@logging/AbstractLogging.view'
import { AbstractLoggingView } from 'database'
import { Profile } from '@/apis/humhub/model/Profile'
export class ProfileLoggingView extends AbstractLoggingView {

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { Account } from './Account'
import { Profile } from './Profile'

View File

@ -1,5 +1,5 @@
/* eslint-disable camelcase */
import { User } from '@entity/User'
import { User } from 'database'
import { convertGradidoLanguageToHumhub } from '@/apis/humhub/convertLanguage'
import { PublishNameLogic } from '@/data/PublishName.logic'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { AbstractUser } from './AbstractUser'

View File

@ -1,5 +1,5 @@
import { User } from '@entity/User'
import { UserContact } from '@entity/UserContact'
import { User } from 'database'
import { UserContact } from 'database'
import { v4 as uuidv4 } from 'uuid'
import { PublishNameType } from '@/graphql/enum/PublishNameType'

View File

@ -1,5 +1,5 @@
/* eslint-disable camelcase */
import { User } from '@entity/User'
import { User } from 'database'
import { CONFIG } from '@/config'
import { PublishNameLogic } from '@/data/PublishName.logic'

View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-empty-function */
import { User } from '@entity/User'
import { UserContact } from '@entity/UserContact'
import { User } from 'database'
import { UserContact } from 'database'
import { GetUser } from './model/GetUser'
import { syncUser, ExecutedHumhubAction } from './syncUser'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { LogError } from '@/server/LogError'

View File

@ -1,6 +1,6 @@
/* eslint-disable camelcase */
import { OpenaiThreads } from '@entity/OpenaiThreads'
import { User } from '@entity/User'
import { OpenaiThreads } from 'database'
import { User } from 'database'
import { OpenAI } from 'openai'
import { Message } from 'openai/resources/beta/threads/messages'

View File

@ -2,8 +2,8 @@
/* eslint-disable n/no-process-env */
// eslint-disable-next-line import/no-unresolved
import { validate } from '@config/index'
import { latestDbVersion } from '@dbTools/config/detectLastDBVersion'
import { validate } from 'config-schema'
import { latestDbVersion } from 'database'
import { Decimal } from 'decimal.js-light'
import dotenv from 'dotenv'

View File

@ -26,7 +26,7 @@ import {
OPENAI_ACTIVE,
PRODUCTION,
TYPEORM_LOGGING_RELATIVE_PATH,
} from '@config/commonSchema'
} from 'config-schema'
import Joi from 'joi'
export const schema = Joi.object({

View File

@ -1,4 +1,4 @@
import { Contribution } from '@entity/Contribution'
import { Contribution } from 'database'
import { Decimal } from 'decimal.js-light'
import {

View File

@ -1,6 +1,6 @@
import { Contribution } from '@entity/Contribution'
import { ContributionMessage } from '@entity/ContributionMessage'
import { User } from '@entity/User'
import { Contribution } from 'database'
import { ContributionMessage } from 'database'
import { User } from 'database'
import { ContributionMessageType } from '@/graphql/enum/ContributionMessageType'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { v4 as uuidv4 } from 'uuid'
import { PublishNameType } from '@/graphql/enum/PublishNameType'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import XRegExp from 'xregexp'
import { PublishNameType } from '@/graphql/enum/PublishNameType'

View File

@ -1,5 +1,5 @@
import { User } from '@entity/User'
import { UserRole } from '@entity/UserRole'
import { User } from 'database'
import { UserRole } from 'database'
import { RoleNames } from '@enum/RoleNames'

View File

@ -2,7 +2,7 @@
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
import { Connection } from '@dbTools/typeorm'
import { Connection } from 'typeorm'
import { ApolloServerTestClient } from 'apollo-server-testing'
import { Decimal } from 'decimal.js-light'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { ContributionLink as DbContributionLink } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { ContributionLink as DbContributionLink } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,6 +1,6 @@
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { ContributionLink as DbContributionLink } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,7 +1,7 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { ContributionMessage as DbContributionMessage } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,8 +1,8 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
import { Event as DbEvent } from '@entity/Event'
import { Transaction as DbTransaction } from '@entity/Transaction'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { ContributionLink as DbContributionLink } from 'database'
import { Event as DbEvent } from 'database'
import { Transaction as DbTransaction } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,7 +1,7 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { ContributionMessage as DbContributionMessage } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,6 +1,6 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,6 +1,6 @@
import { Event as DbEvent } from '@entity/Event'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { TransactionLink as DbTransactionLink } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { Event as DbEvent } from '@entity/Event'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { TransactionLink as DbTransactionLink } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,6 +1,6 @@
import { Event as DbEvent } from '@entity/Event'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { TransactionLink as DbTransactionLink } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { Event as DbEvent } from '@entity/Event'
import { Transaction as DbTransaction } from '@entity/Transaction'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { Transaction as DbTransaction } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,6 +1,6 @@
import { Event as DbEvent } from '@entity/Event'
import { Transaction as DbTransaction } from '@entity/Transaction'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { Transaction as DbTransaction } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { Event } from './Event'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User'
import { Event as DbEvent } from 'database'
import { User as DbUser } from 'database'
import { Event } from './Event'
import { EventType } from './EventType'

View File

@ -1,10 +1,10 @@
import { Contribution as DbContribution } from '@entity/Contribution'
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
import { Event as DbEvent } from '@entity/Event'
import { Transaction as DbTransaction } from '@entity/Transaction'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { User as DbUser } from '@entity/User'
import { Contribution as DbContribution } from 'database'
import { ContributionLink as DbContributionLink } from 'database'
import { ContributionMessage as DbContributionMessage } from 'database'
import { Event as DbEvent } from 'database'
import { Transaction as DbTransaction } from 'database'
import { TransactionLink as DbTransactionLink } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { EventType } from './EventType'

View File

@ -1,5 +1,5 @@
import { Community as DbCommunity } from '@entity/Community'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { Community as DbCommunity } from 'database'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { validate as validateUUID, version as versionUUID } from 'uuid'
import { CONFIG } from '@/config'

View File

@ -1,4 +1,4 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { GraphQLClient } from 'graphql-request'
import { backendLogger as logger } from '@/server/logger'

View File

@ -1,4 +1,4 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { GraphQLClient } from 'graphql-request'
import { getPublicCommunityInfo } from '@/federation/client/1_0/query/getPublicCommunityInfo'

View File

@ -1,4 +1,4 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { GraphQLClient } from 'graphql-request'
import { LogError } from '@/server/LogError'

View File

@ -1,4 +1,4 @@
import { AbstractLoggingView } from '@logging/AbstractLogging.view'
import { AbstractLoggingView } from 'database'
import { PublicCommunityInfo } from '@/federation/client/1_0/model/PublicCommunityInfo'

View File

@ -1,4 +1,4 @@
import { AbstractLoggingView } from '@logging/AbstractLogging.view'
import { AbstractLoggingView } from 'database'
import { SendCoinsArgs } from '@/federation/client/1_0/model/SendCoinsArgs'

View File

@ -1,4 +1,4 @@
import { AbstractLoggingView } from '@logging/AbstractLogging.view'
import { AbstractLoggingView } from 'database'
import { SendCoinsResult } from '@/federation/client/1_0/model/SendCoinsResult'

View File

@ -1,4 +1,4 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
// eslint-disable-next-line camelcase
import { AuthenticationClient as V1_0_AuthenticationClient } from '@/federation/client/1_0/AuthenticationClient'

View File

@ -1,4 +1,4 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
// eslint-disable-next-line camelcase
import { FederationClient as V1_0_FederationClient } from '@/federation/client/1_0/FederationClient'

View File

@ -1,4 +1,4 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
// eslint-disable-next-line camelcase
import { SendCoinsClient as V1_0_SendCoinsClient } from '@/federation/client/1_0/SendCoinsClient'

View File

@ -5,8 +5,8 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Connection } from '@dbTools/typeorm'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { Connection } from 'typeorm'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { ApolloServerTestClient } from 'apollo-server-testing'
import { GraphQLClient } from 'graphql-request'
import { Response } from 'graphql-request/dist/types'

View File

@ -1,10 +1,9 @@
/** eslint-disable @typescript-eslint/no-unsafe-assignment */
/** eslint-disable @typescript-eslint/no-unsafe-call */
import { IsNull } from '@dbTools/typeorm'
import { Community as DbCommunity } from '@entity/Community'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunityLoggingView } from '@logging/FederatedCommunityLogging.view'
import { IsNull } from 'typeorm'
import { Community as DbCommunity } from 'database'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { FederatedCommunityLoggingView } from 'database'
import { FederationClient as V1_0_FederationClient } from '@/federation/client/1_0/FederationClient'
import { PublicCommunityInfo } from '@/federation/client/1_0/model/PublicCommunityInfo'
import { FederationClientFactory } from '@/federation/client/FederationClientFactory'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { AuthChecker } from 'type-graphql'
import { RoleNames } from '@enum/RoleNames'

View File

@ -1,6 +1,6 @@
import { Point } from '@dbTools/typeorm'
import { Community as DbCommunity } from '@entity/Community'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { Point } from 'typeorm'
import { Community as DbCommunity } from 'database'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { ObjectType, Field } from 'type-graphql'
import { Point2Location } from '@/graphql/resolver/util/Location2Point'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { Field, Int, ObjectType } from 'type-graphql'
@ObjectType()

View File

@ -1,4 +1,4 @@
import { Community as DbCommunity } from '@entity/Community'
import { Community as DbCommunity } from 'database'
import { ObjectType, Field, Int } from 'type-graphql'
@ObjectType()

View File

@ -1,5 +1,5 @@
import { Contribution as dbContribution } from '@entity/Contribution'
import { User as DbUser } from '@entity/User'
import { Contribution as dbContribution } from 'database'
import { User as DbUser } from 'database'
import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql'

View File

@ -1,4 +1,4 @@
import { ContributionLink as dbContributionLink } from '@entity/ContributionLink'
import { ContributionLink as dbContributionLink } from 'database'
import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql'

View File

@ -1,5 +1,5 @@
import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
import { User } from '@entity/User'
import { ContributionMessage as DbContributionMessage } from 'database'
import { User } from 'database'
import { Field, Int, ObjectType } from 'type-graphql'
@ObjectType()

View File

@ -1,4 +1,4 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { FederatedCommunity as DbFederatedCommunity } from 'database'
import { ObjectType, Field, Int } from 'type-graphql'
import { ensureUrlEndsWithSlash } from '@/util/utilities'

View File

@ -1,4 +1,4 @@
import { ProjectBranding as dbProjectBranding } from '@entity/ProjectBranding'
import { ProjectBranding as dbProjectBranding } from 'database'
import { ObjectType, Field, Int } from 'type-graphql'
@ObjectType()

View File

@ -1,4 +1,4 @@
import { Transaction as dbTransaction } from '@entity/Transaction'
import { Transaction as dbTransaction } from 'database'
import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql'

View File

@ -1,4 +1,4 @@
import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
import { TransactionLink as dbTransactionLink } from 'database'
import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql'

View File

@ -1,5 +1,5 @@
import { Contribution } from '@entity/Contribution'
import { User } from '@entity/User'
import { Contribution } from 'database'
import { User } from 'database'
import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql'

View File

@ -1,5 +1,5 @@
import { Point } from '@dbTools/typeorm'
import { User as dbUser } from '@entity/User'
import { Point } from 'typeorm'
import { User as dbUser } from 'database'
import { ObjectType, Field, Int } from 'type-graphql'
import { GmsPublishLocationType } from '@enum/GmsPublishLocationType'

View File

@ -1,4 +1,4 @@
import { User } from '@entity/User'
import { User } from 'database'
import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql'

View File

@ -1,4 +1,4 @@
import { UserContact as DbUserContact } from '@entity/UserContact'
import { UserContact as DbUserContact } from 'database'
import { ObjectType, Field, Int } from 'type-graphql'
@ObjectType()

View File

@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/restrict-template-expressions */
import { IsNull } from '@dbTools/typeorm'
import { Transaction as dbTransaction } from '@entity/Transaction'
import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
import { IsNull } from 'typeorm'
import { Transaction as dbTransaction } from 'database'
import { TransactionLink as dbTransactionLink } from 'database'
import { Decimal } from 'decimal.js-light'
import { Resolver, Query, Ctx, Authorized } from 'type-graphql'

Some files were not shown because too many files have changed in this diff Show More