Merge branch 'dev/restructure' into staging

12 files changed, 3 insertions, 4 deletions

diff --git a/api/scripts/droptables.sql b/scripts/droptables.sql

index 8a852048..8a852048 100644
--- a/api/scripts/droptables.sql
+++ b/scripts/droptables.sql
diff --git a/api/scripts/generate_openapi.js b/scripts/generate_openapi.js

index 9624a5b9..9624a5b9 100644
--- a/api/scripts/generate_openapi.js
+++ b/scripts/generate_openapi.js
diff --git a/api/scripts/generate_schema.js b/scripts/generate_schema.js

index 7a498ad6..6925df5d 100644
--- a/api/scripts/generate_schema.js
+++ b/scripts/generate_schema.js
@@ -48,9 +48,8 @@ function modify(obj) {
 }
 
 function main() {
-	const files = 		[
-		...walk(path.join(__dirname, "..", "src", "routes")),
-		...walk(path.join(__dirname, "..", "..", "util", "src")),
+	const files = [
+		...walk(path.join(__dirname, "..", "src", "util", "schemas")),
 	];
 	const program = TJS.getProgramFromFiles(
 		files,
diff --git a/api/scripts/stresstest/.gitignore b/scripts/stresstest/.gitignore

index bde26fd4..bde26fd4 100644
--- a/api/scripts/stresstest/.gitignore
+++ b/scripts/stresstest/.gitignore
diff --git a/api/scripts/stresstest/accounts.json.example b/scripts/stresstest/accounts.json.example

index 61904c5e..61904c5e 100644
--- a/api/scripts/stresstest/accounts.json.example
+++ b/scripts/stresstest/accounts.json.example
diff --git a/api/scripts/stresstest/config.json.example b/scripts/stresstest/config.json.example

index 73f52f05..73f52f05 100644
--- a/api/scripts/stresstest/config.json.example
+++ b/scripts/stresstest/config.json.example
diff --git a/api/scripts/stresstest/index.js b/scripts/stresstest/index.js

index 740a9011..740a9011 100644
--- a/api/scripts/stresstest/index.js
+++ b/scripts/stresstest/index.js
diff --git a/api/scripts/stresstest/package-lock.json b/scripts/stresstest/package-lock.json

index 81c9b817..81c9b817 100644
--- a/api/scripts/stresstest/package-lock.json
+++ b/scripts/stresstest/package-lock.json
diff --git a/api/scripts/stresstest/package.json b/scripts/stresstest/package.json

index 8d94d05b..8d94d05b 100644
--- a/api/scripts/stresstest/package.json
+++ b/scripts/stresstest/package.json
diff --git a/api/scripts/stresstest/src/login/index.js b/scripts/stresstest/src/login/index.js

index ab6c9719..b153550e 100644
--- a/api/scripts/stresstest/src/login/index.js
+++ b/scripts/stresstest/src/login/index.js
@@ -1,6 +1,6 @@
 const fetch = require("node-fetch");
 const fs = require("fs");
-let config = require("./../../config.json");
+let config = require("../../config.json");
 module.exports = login;
 async function login(account) {
 	let body = {
diff --git a/api/scripts/stresstest/src/message/send.js b/scripts/stresstest/src/message/send.js

index d1b86914..d1b86914 100644
--- a/api/scripts/stresstest/src/message/send.js
+++ b/scripts/stresstest/src/message/send.js
diff --git a/api/scripts/stresstest/src/register/index.js b/scripts/stresstest/src/register/index.js

index 578b9022..578b9022 100644
--- a/api/scripts/stresstest/src/register/index.js
+++ b/scripts/stresstest/src/register/index.js