From 7e4c3ec3ced756e67c2c8e9dc664a8044d216e27 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 7 Mar 2022 21:56:03 +0100 Subject: [PATCH] more resolved paths --- backend/src/apis/KlicktippController.ts | 2 +- backend/src/auth/JWT.ts | 2 +- backend/src/mailer/sendEMail.ts | 2 +- backend/src/middleware/klicktippMiddleware.ts | 6 +++--- backend/src/server/createServer.ts | 10 +++++----- backend/src/typeorm/connection.ts | 2 +- backend/src/typeorm/repository/Transaction.ts | 4 ++-- .../src/typeorm/repository/UserSettingRepository.ts | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts index 0777211ad..824d40af2 100644 --- a/backend/src/apis/KlicktippController.ts +++ b/backend/src/apis/KlicktippController.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { KlicktippConnector } from './klicktippConnector' -import CONFIG from '../config' +import CONFIG from '@/config' const klicktippConnector = new KlicktippConnector() diff --git a/backend/src/auth/JWT.ts b/backend/src/auth/JWT.ts index 06c6507b8..e32e68223 100644 --- a/backend/src/auth/JWT.ts +++ b/backend/src/auth/JWT.ts @@ -1,5 +1,5 @@ import jwt from 'jsonwebtoken' -import CONFIG from '../config/' +import CONFIG from '@/config/' import { CustomJwtPayload } from './CustomJwtPayload' export const decode = (token: string): CustomJwtPayload | null => { diff --git a/backend/src/mailer/sendEMail.ts b/backend/src/mailer/sendEMail.ts index e26589347..13c28996b 100644 --- a/backend/src/mailer/sendEMail.ts +++ b/backend/src/mailer/sendEMail.ts @@ -1,6 +1,6 @@ import { createTransport } from 'nodemailer' -import CONFIG from '../config' +import CONFIG from '@/config' export const sendEMail = async (emailDef: { to: string diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts index d0fde8195..b3699f29b 100644 --- a/backend/src/middleware/klicktippMiddleware.ts +++ b/backend/src/middleware/klicktippMiddleware.ts @@ -1,7 +1,7 @@ import { MiddlewareFn } from 'type-graphql' -import { /* klicktippSignIn, */ getKlickTippUser } from '../apis/KlicktippController' -import { KlickTipp } from '../graphql/model/KlickTipp' -import CONFIG from '../config/index' +import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController' +import { KlickTipp } from '@model/KlickTipp' +import CONFIG from '@/config' // export const klicktippRegistrationMiddleware: MiddlewareFn = async ( // // Only for demo diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 4596eef4a..c52ca791a 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -5,8 +5,8 @@ import { ApolloServer } from 'apollo-server-express' import express, { Express } from 'express' // database -import connection from '../typeorm/connection' -import { checkDBVersion } from '../typeorm/DBVersion' +import connection from '@/typeorm/connection' +import { checkDBVersion } from '@/typeorm/DBVersion' // server import cors from './cors' @@ -14,13 +14,13 @@ import serverContext from './context' import plugins from './plugins' // config -import CONFIG from '../config' +import CONFIG from '@/config' // graphql -import schema from '../graphql/schema' +import schema from '@/graphql/schema' // webhooks -import { elopageWebhook } from '../webhook/elopage' +import { elopageWebhook } from '@/webhook/elopage' import { Connection } from '@dbTools/typeorm' // TODO implement diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts index bfd64f92f..745b2da94 100644 --- a/backend/src/typeorm/connection.ts +++ b/backend/src/typeorm/connection.ts @@ -1,7 +1,7 @@ // TODO This is super weird - since the entities are defined in another project they have their own globals. // We cannot use our connection here, but must use the external typeorm installation import { Connection, createConnection, FileLogger } from '@dbTools/typeorm' -import CONFIG from '../config' +import CONFIG from '@/config' import { entities } from '@entity/index' const connection = async (): Promise => { diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index e1af105f8..f84b57626 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { Transaction } from '@entity/Transaction' -import { Order } from '../../graphql/enum/Order' -import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId' +import { Order } from '@enum/Order' +import { TransactionTypeId } from '@enum/TransactionTypeId' @EntityRepository(Transaction) export class TransactionRepository extends Repository { diff --git a/backend/src/typeorm/repository/UserSettingRepository.ts b/backend/src/typeorm/repository/UserSettingRepository.ts index 42171e04a..528090ff2 100644 --- a/backend/src/typeorm/repository/UserSettingRepository.ts +++ b/backend/src/typeorm/repository/UserSettingRepository.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { UserSetting } from '@entity/UserSetting' -import { Setting } from '../../graphql/enum/Setting' -import { isStringBoolean } from '../../util/validate' +import { Setting } from '@enum/Setting' +import { isStringBoolean } from '@/util/validate' @EntityRepository(UserSetting) export class UserSettingRepository extends Repository {