Merge branch 'dev' into feature/17-automated_tests

2020-12-09 19:42:51 +01:00
parent 6396fffc04 429041fef1
commit d2898ff60f
18 changed files with 1111 additions and 1060 deletions
--- a/ormconfig.ts
+++ b/ormconfig.ts
@@ -1,12 +1,12 @@
-import { config } from 'dotenv-safe';
-config();
-
-export default {
-	type: process.env.DB_TYPE,
-	host: process.env.DB_HOST,
-	port: process.env.DB_PORT,
-	username: process.env.DB_USER,
-	password: process.env.DB_PASSWORD,
-	database: process.env.DB_NAME,
-	entities: ["src/models/entities/*.ts"]
-};
+import { config } from 'dotenv';
+config();
+
+export default {
+	type: process.env.DB_TYPE,
+	host: process.env.DB_HOST,
+	port: process.env.DB_PORT,
+	username: process.env.DB_USER,
+	password: process.env.DB_PASSWORD,
+	database: process.env.DB_NAME,
+	entities: ["src/models/entities/*.ts"]
+};