rename module 'api' to 'server'

2019-02-02 22:54:41 +01:00 · 2019-02-02 22:54:41 +01:00 · fea52653f1
parent 98cfc802b6
commit fea52653f1
796 changed files with 2585134 additions and 14 deletions
--- a/README.md
+++ b/README.md
@ -53,7 +53,7 @@ To compile the Angular code and afterwards start the Express server with `nodemo
 npm run dev
 ```

-Any changes on `api` code will trigger an automatic restart of the Express server.
+Any changes on `server` code will trigger an automatic restart of the Express server.

 Changes on `static` code can be submitted with

@ -69,7 +69,7 @@ _TODO_
 ## License Information


-### Express API (`/api`)
+### NodeJS Express Server (`/server`)
 published under [CC BY-SA 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt) \
 Main concept for API Server, pagination and MongoDB usage by [Prof. Dr.-Ing. Johannes Konert](https://prof.beuth-hochschule.de/konert/) \
 All endpoints, signature image builder and Arma3 RPT-Log parsing by [Florian Hartwich](https://de.linkedin.com/in/florian-hartwich-b67b02125)
--- a/package.json
+++ b/package.json
@ -4,20 +4,20 @@
  "author": "Florian Hartwich <hardi@noarch.de>",
  "private": true,
  "scripts": {
-    "start": "npm run deploy-static-prod && npm start --prefix ./api",
-    "dev": "npm run deploy-static && npm run dev --prefix ./api",
+    "start": "npm run deploy-static-prod && npm start --prefix ./server",
+    "dev": "npm run deploy-static && npm run dev --prefix ./server",
    "pre-deploy-clean": "rm -f ./public/resource",
    "deploy-static": "npm run pre-deploy-clean && npm run build --prefix=static && npm run deploy-static:link-resource && npm run deploy-static:api-docs",
    "deploy-static:prod": "npm run pre-deploy-clean && npm run build:prod --prefix=static && npm run deploy-static:link-resource && npm run deploy-static:api-docs",
-    "deploy-static:link-resource": "ln -s ../api/resource/ public/resource",
-    "deploy-static:api-docs": "npm run api:docs --prefix=api",
-    "postinstall": "npm install --prefix ./static && npm install --prefix  ./api",
-    "lint": "npm run lint --prefix=api && npm run lint --prefix=static",
-    "test": "npm test --prefix ./api",
-    "e2e": "npm run deploy-static && concurrently \"npm run start-test --prefix ./api\" \"wait-on -t 60000 http://localhost:3001/ && npm run e2e --prefix ./static\" --success first --kill-others",
-    "start-e2e": "npm run deploy-static && npm run start-test --prefix ./api",
+    "deploy-static:link-resource": "ln -s ../server/resource/ public/resource",
+    "deploy-static:api-docs": "npm run api:docs --prefix=server",
+    "postinstall": "npm install --prefix ./static && npm install --prefix  ./server",
+    "lint": "npm run lint --prefix=server && npm run lint --prefix=static",
+    "test": "npm test --prefix ./server",
+    "e2e": "npm run deploy-static && concurrently \"npm run start-test --prefix ./server\" \"wait-on -t 60000 http://localhost:3001/ && npm run e2e --prefix ./static\" --success first --kill-others",
+    "start-e2e": "npm run deploy-static && npm run start-test --prefix ./server",
    "test-e2e": "npm run e2e --prefix ./static",
-    "test-api": "npm run api:test-docs --prefix ./api"
+    "test-api": "npm run api:test-docs --prefix ./server"
  },
  "dependencies": {},
  "devDependencies": {
--- a/server/.eslintrc.js
+++ b/server/.eslintrc.js
--- a/server/LICENSE.txt
+++ b/server/LICENSE.txt
--- a/server/apib/admin/account.apib
+++ b/server/apib/admin/account.apib
--- a/server/apib/admin/signature.apib
+++ b/server/apib/admin/signature.apib
--- a/server/apib/army-management/army.apib
+++ b/server/apib/army-management/army.apib
--- a/server/apib/army-management/awardings.apib
+++ b/server/apib/army-management/awardings.apib
--- a/server/apib/army-management/decorations.apib
+++ b/server/apib/army-management/decorations.apib
--- a/server/apib/army-management/promotions.apib
+++ b/server/apib/army-management/promotions.apib
--- a/server/apib/army-management/ranks.apib
+++ b/server/apib/army-management/ranks.apib
--- a/server/apib/army-management/squads.apib
+++ b/server/apib/army-management/squads.apib
--- a/server/apib/army-management/users.apib
+++ b/server/apib/army-management/users.apib
--- a/server/apib/auth/login.apib
+++ b/server/apib/auth/login.apib
--- a/server/apib/auth/signup.apib
+++ b/server/apib/auth/signup.apib
--- a/server/apib/base/access.apib
+++ b/server/apib/base/access.apib
--- a/server/apib/base/datetime.apib
+++ b/server/apib/base/datetime.apib
--- a/server/apib/base/file-resources.apib
+++ b/server/apib/base/file-resources.apib
--- a/server/apib/data_structures/_app-user.apib
+++ b/server/apib/data_structures/_app-user.apib
--- a/server/apib/data_structures/_army.apib
+++ b/server/apib/data_structures/_army.apib
--- a/server/apib/data_structures/_auth.apib
+++ b/server/apib/data_structures/_auth.apib
--- a/server/apib/data_structures/_awarding.apib
+++ b/server/apib/data_structures/_awarding.apib
--- a/server/apib/data_structures/_campaign.apib
+++ b/server/apib/data_structures/_campaign.apib
--- a/server/apib/data_structures/_decoration.apib
+++ b/server/apib/data_structures/_decoration.apib
--- a/server/apib/data_structures/_log.apib
+++ b/server/apib/data_structures/_log.apib
--- a/server/apib/data_structures/_player.apib
+++ b/server/apib/data_structures/_player.apib
--- a/server/apib/data_structures/_promotion.apib
+++ b/server/apib/data_structures/_promotion.apib
--- a/server/apib/data_structures/_rank.apib
+++ b/server/apib/data_structures/_rank.apib
--- a/server/apib/data_structures/_squad.apib
+++ b/server/apib/data_structures/_squad.apib
--- a/server/apib/data_structures/_user.apib
+++ b/server/apib/data_structures/_user.apib
--- a/server/apib/data_structures/_war.apib
+++ b/server/apib/data_structures/_war.apib
--- a/server/apib/data_structures/index.apib
+++ b/server/apib/data_structures/index.apib
--- a/server/apib/dev-doc.apib
+++ b/server/apib/dev-doc.apib
--- a/server/apib/documentation.apib
+++ b/server/apib/documentation.apib
--- a/server/apib/dredd/data/app_user.json
+++ b/server/apib/dredd/data/app_user.json
--- a/server/apib/dredd/data/awarding.json
+++ b/server/apib/dredd/data/awarding.json
--- a/server/apib/dredd/data/campaign.json
+++ b/server/apib/dredd/data/campaign.json
--- a/server/apib/dredd/data/decoration.json
+++ b/server/apib/dredd/data/decoration.json
--- a/server/apib/dredd/data/logBudget.json
+++ b/server/apib/dredd/data/logBudget.json
--- a/server/apib/dredd/data/logFlag.json
+++ b/server/apib/dredd/data/logFlag.json
--- a/server/apib/dredd/data/logKill.json
+++ b/server/apib/dredd/data/logKill.json
--- a/server/apib/dredd/data/logPoints.json
+++ b/server/apib/dredd/data/logPoints.json
--- a/server/apib/dredd/data/logRespawn.json
+++ b/server/apib/dredd/data/logRespawn.json
--- a/server/apib/dredd/data/logRevive.json
+++ b/server/apib/dredd/data/logRevive.json
--- a/server/apib/dredd/data/logTransport.json
+++ b/server/apib/dredd/data/logTransport.json
--- a/server/apib/dredd/data/logVehicle.json
+++ b/server/apib/dredd/data/logVehicle.json
--- a/server/apib/dredd/data/player.json
+++ b/server/apib/dredd/data/player.json
--- a/server/apib/dredd/data/promotion.json
+++ b/server/apib/dredd/data/promotion.json
--- a/server/apib/dredd/data/rank.json
+++ b/server/apib/dredd/data/rank.json
--- a/server/apib/dredd/data/resource/decoration/5abd3dff6e6a0334d95b8ba0.png
+++ b/server/apib/dredd/data/resource/decoration/5abd3dff6e6a0334d95b8ba0.png
--- a/server/apib/dredd/data/resource/decoration/5abeb420b987672bb1ede643.png
+++ b/server/apib/dredd/data/resource/decoration/5abeb420b987672bb1ede643.png
--- a/server/apib/dredd/data/resource/decoration/5abeb43cb987672bb1ede644.png
+++ b/server/apib/dredd/data/resource/decoration/5abeb43cb987672bb1ede644.png
--- a/server/apib/dredd/data/resource/logs/5abf65ae3fc5fa349ffd5ca3/clean.log
+++ b/server/apib/dredd/data/resource/logs/5abf65ae3fc5fa349ffd5ca3/clean.log
--- a/server/apib/dredd/data/resource/logs/5abf65ae3fc5fa349ffd5ca3/war.log
+++ b/server/apib/dredd/data/resource/logs/5abf65ae3fc5fa349ffd5ca3/war.log
--- a/server/apib/dredd/data/resource/logs/5abf65d83fc5fa349ffd5cbb/clean.log
+++ b/server/apib/dredd/data/resource/logs/5abf65d83fc5fa349ffd5cbb/clean.log
--- a/server/apib/dredd/data/resource/logs/5abf65d83fc5fa349ffd5cbb/war.log
+++ b/server/apib/dredd/data/resource/logs/5abf65d83fc5fa349ffd5cbb/war.log
--- a/server/apib/dredd/data/resource/rank/5aba5504eadcce6332c6a775.png
+++ b/server/apib/dredd/data/resource/rank/5aba5504eadcce6332c6a775.png
--- a/server/apib/dredd/data/resource/rank/5abeb1b995cf43205225710a.png
+++ b/server/apib/dredd/data/resource/rank/5abeb1b995cf43205225710a.png
--- a/server/apib/dredd/data/resource/rank/5abeb23995cf43205225710b.png
+++ b/server/apib/dredd/data/resource/rank/5abeb23995cf43205225710b.png
--- a/server/apib/dredd/data/resource/squad/5aba54eaeadcce6332c6a774.png
+++ b/server/apib/dredd/data/resource/squad/5aba54eaeadcce6332c6a774.png
--- a/server/apib/dredd/data/resource/squad/5abe166f8b7488392a623f12.png
+++ b/server/apib/dredd/data/resource/squad/5abe166f8b7488392a623f12.png
--- a/server/apib/dredd/data/resource/squad/5abe16f98b7488392a623f17.png
+++ b/server/apib/dredd/data/resource/squad/5abe16f98b7488392a623f17.png
--- a/server/apib/dredd/data/squad.json
+++ b/server/apib/dredd/data/squad.json
--- a/server/apib/dredd/data/tmp-resource/decoration/5abd3dff6e6a0334d95b8ba0.png
+++ b/server/apib/dredd/data/tmp-resource/decoration/5abd3dff6e6a0334d95b8ba0.png
--- a/server/apib/dredd/data/tmp-resource/decoration/5abeb420b987672bb1ede643.png
+++ b/server/apib/dredd/data/tmp-resource/decoration/5abeb420b987672bb1ede643.png
@ -0,0 +1,2 @@
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX/TQBcNTh/AAAAAXRSTlMA
+QObYZgAAAApJREFUeJxjYgAAAAYAAzY3fKgAAAAASUVORK5CYII=
--- a/server/apib/dredd/data/tmp-resource/decoration/5bcc82db107007751b76da8f.png
+++ b/server/apib/dredd/data/tmp-resource/decoration/5bcc82db107007751b76da8f.png
@ -0,0 +1,2 @@
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX/TQBcNTh/AAAAAXRSTlMA
+QObYZgAAAApJREFUeJxjYgAAAAYAAzY3fKgAAAAASUVORK5CYII=
--- a/server/apib/dredd/data/tmp-resource/logs/5abf65ae3fc5fa349ffd5ca3/clean.log
+++ b/server/apib/dredd/data/tmp-resource/logs/5abf65ae3fc5fa349ffd5ca3/clean.log
@ -0,0 +1,34 @@
+2018/03/20, 20:05:43 "[OPT] (Budget) LOG: 0:00:00 --- Startbudget: NATO 4.5355e+006 - CSAT 4.22125e+006"
+
+2018/03/20, 20:06:45 "[OPT] (Budget) LOG: 0:01:02 --- NATO alt: 4.5355e+006 - neu: 4.1955e+006 - Differenz: -340000"
+
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Saxe (WEST) von: Selbstverschulden."
+
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Pumarang (WEST) von: Saxe (WEST)."
+
+2018/03/20, 20:10:13 "[OPT] (Budget) LOG: 0:04:30 --- CSAT alt: 2.38425e+006 - neu: 2.32425e+006 - Differenz: -60000"
+
+2018/03/20, 20:15:54 "[OPT] (Punkte) LOG: 0:10:11 --- Kein Dominator (NATO 0 | CSAT 0)"
+
+2018/03/20, 20:17:51 "[OPT] (Abschuss) LOG: 0:12:08 --- patze (EAST) von: Wiesl (WEST)."
+
+2018/03/20, 20:18:20 "[OPT] (Fahne) LOG: 0:12:37 --- CSAT Flagge erobert von Wiesl"
+
+2018/03/20, 20:18:38 "[OPT] (Abschuss) LOG: 0:12:55 --- Nicolas (WEST) von: Wiesl (WEST)."
+
+2018/03/20, 20:18:59 "[OPT] (Punkte) LOG: 0:13:16 --- NATO +1 (NATO 1 | CSAT 0)"
+
+2018/03/20, 20:19:38 "[OPT] (Fahne) LOG: 0:13:56 --- CSAT Flagge gesichert von ALASTOR"
+
+2018/03/20, 20:22:18 "[OPT] (Abschuss) LOG: 0:16:35 --- Fahrzeug: Hunter-HMG (OPT_NATO) von: Murda]X[ (EAST)."
+
+2018/03/20, 20:37:19 "[OPT] (Transport) LOG: 0:31:36 --- Dominik (WEST) wurde von Ponykloete (WEST) eingeflogen (8666.94 m)"
+
+2018/03/20, 20:41:27 "[OPT] (Revive) LOG: 0:35:44 --- Bodochecker (EAST) wurde von ALASTOR (EAST) stabilisiert."
+
+2018/03/20, 20:41:35 "[OPT] (Revive) LOG: 0:35:52 --- Andi-de (WEST) wurde von Wiesl (WEST) wiederbelebt."
+
+2018/03/20, 22:35:43 "[OPT] (Budget) LOG: 2:30:00 --- Endbudget: (NATO 1997000 | CSAT 512000)"
+
+2018/03/20, 22:35:43 "[OPT] (Punkte) LOG: 2:30:00 --- Endpunktestand: (NATO 34 | CSAT 25)"
+
--- a/server/apib/dredd/data/tmp-resource/logs/5abf65ae3fc5fa349ffd5ca3/war.log
+++ b/server/apib/dredd/data/tmp-resource/logs/5abf65ae3fc5fa349ffd5ca3/war.log
@ -0,0 +1,29 @@
+Error: ENOENT: no such file or directory, open '
+2018/03/20, 20:05:43 "[OPT] (Budget) LOG: 0:00:00 --- Startbudget: NATO 4.5355e+006 - CSAT 4.22125e+006"
+2018/03/20, 20:06:45 "[OPT] (Budget) LOG: 0:01:02 --- NATO alt: 4.5355e+006 - neu: 4.1955e+006 - Differenz: -340000"
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Saxe (WEST) von: Selbstverschulden."
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Pumarang (WEST) von: Saxe (WEST)."
+2018/03/20, 20:10:13 "[OPT] (Budget) LOG: 0:04:30 --- CSAT alt: 2.38425e+006 - neu: 2.32425e+006 - Differenz: -60000"
+2018/03/20, 20:10:38 "[OPT] (Respawn) LOG: 0:04:55 --- Spieler: Pumarang - Kosten: 3000"
+2018/03/20, 20:15:54 "[OPT] (Punkte) LOG: 0:10:11 --- Kein Dominator (NATO 0 | CSAT 0)"
+2018/03/20, 20:17:51 "[OPT] (Abschuss) LOG: 0:12:08 --- patze (EAST) von: Wiesl (WEST)."
+2018/03/20, 20:18:20 "[OPT] (Fahne) LOG: 0:12:37 --- CSAT Flagge erobert von Wiesl"
+2018/03/20, 20:18:38 "[OPT] (Abschuss) LOG: 0:12:55 --- Nicolas (WEST) von: Wiesl (WEST)."
+2018/03/20, 20:18:59 "[OPT] (Punkte) LOG: 0:13:16 --- NATO +1 (NATO 1 | CSAT 0)"
+2018/03/20, 20:19:38 "[OPT] (Fahne) LOG: 0:13:56 --- CSAT Flagge gesichert von ALASTOR"
+2018/03/20, 20:22:18 "[OPT] (Abschuss) LOG: 0:16:35 --- Fahrzeug: Hunter-HMG (OPT_NATO) von: Murda]X[ (EAST)."
+2018/03/20, 20:37:19 "[OPT] (Transport) LOG: 0:31:36 --- Dominik (WEST) wurde von Ponykloete (WEST) eingeflogen (8666.94 m)"
+2018/03/20, 20:41:27 "[OPT] (Revive) LOG: 0:35:44 --- Bodochecker (EAST) wurde von ALASTOR (EAST) stabilisiert."
+2018/03/20, 20:41:35 "[OPT] (Revive) LOG: 0:35:52 --- Andi-de (WEST) wurde von Wiesl (WEST) wiederbelebt."
+2018/03/20, 22:35:43 "[OPT] (Mission) LOG: 2:30:00 --- Missionzeit abgelaufen"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Pumarang (WEST), PUID 76561198050321485"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Mercurat (WEST), PUID 76561198278842491"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- KalleK (EAST), PUID 76561197977676036"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- MAPster (EAST), PUID 76561198009882133"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- LyrikEmu (WEST), PUID 76561198218910400"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Philipp (EAST), PUID 76561198041792069"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Wiesl (WEST), PUID 76561198059648090"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Murda]X[ (EAST), PUID 76561197971121630"
+2018/03/20, 22:35:43 "[OPT] (Budget) LOG: 2:30:00 --- Endbudget: (NATO 1997000 | CSAT 512000)"
+2018/03/20, 22:35:43 "[OPT] (Punkte) LOG: 2:30:00 --- Endpunktestand: (NATO 34 | CSAT 25)"
+'
--- a/server/apib/dredd/data/tmp-resource/logs/5bcc82db107007751b76da95/clean.log
+++ b/server/apib/dredd/data/tmp-resource/logs/5bcc82db107007751b76da95/clean.log
@ -0,0 +1,34 @@
+2018/03/20, 20:05:43 "[OPT] (Budget) LOG: 0:00:00 --- Startbudget: NATO 4.5355e+006 - CSAT 4.22125e+006"
+
+2018/03/20, 20:06:45 "[OPT] (Budget) LOG: 0:01:02 --- NATO alt: 4.5355e+006 - neu: 4.1955e+006 - Differenz: -340000"
+
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Saxe (WEST) von: Selbstverschulden."
+
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Pumarang (WEST) von: Saxe (WEST)."
+
+2018/03/20, 20:10:13 "[OPT] (Budget) LOG: 0:04:30 --- CSAT alt: 2.38425e+006 - neu: 2.32425e+006 - Differenz: -60000"
+
+2018/03/20, 20:15:54 "[OPT] (Punkte) LOG: 0:10:11 --- Kein Dominator (NATO 0 | CSAT 0)"
+
+2018/03/20, 20:17:51 "[OPT] (Abschuss) LOG: 0:12:08 --- patze (EAST) von: Wiesl (WEST)."
+
+2018/03/20, 20:18:20 "[OPT] (Fahne) LOG: 0:12:37 --- CSAT Flagge erobert von Wiesl"
+
+2018/03/20, 20:18:38 "[OPT] (Abschuss) LOG: 0:12:55 --- Nicolas (WEST) von: Wiesl (WEST)."
+
+2018/03/20, 20:18:59 "[OPT] (Punkte) LOG: 0:13:16 --- NATO +1 (NATO 1 | CSAT 0)"
+
+2018/03/20, 20:19:38 "[OPT] (Fahne) LOG: 0:13:56 --- CSAT Flagge gesichert von ALASTOR"
+
+2018/03/20, 20:22:18 "[OPT] (Abschuss) LOG: 0:16:35 --- Fahrzeug: Hunter-HMG (OPT_NATO) von: Murda]X[ (EAST)."
+
+2018/03/20, 20:37:19 "[OPT] (Transport) LOG: 0:31:36 --- Dominik (WEST) wurde von Ponykloete (WEST) eingeflogen (8666.94 m)"
+
+2018/03/20, 20:41:27 "[OPT] (Revive) LOG: 0:35:44 --- Bodochecker (EAST) wurde von ALASTOR (EAST) stabilisiert."
+
+2018/03/20, 20:41:35 "[OPT] (Revive) LOG: 0:35:52 --- Andi-de (WEST) wurde von Wiesl (WEST) wiederbelebt."
+
+2018/03/20, 22:35:43 "[OPT] (Budget) LOG: 2:30:00 --- Endbudget: (NATO 1997000 | CSAT 512000)"
+
+2018/03/20, 22:35:43 "[OPT] (Punkte) LOG: 2:30:00 --- Endpunktestand: (NATO 34 | CSAT 25)"'
+
--- a/server/apib/dredd/data/tmp-resource/logs/5bcc82db107007751b76da95/war.log
+++ b/server/apib/dredd/data/tmp-resource/logs/5bcc82db107007751b76da95/war.log
@ -0,0 +1,28 @@
+Error: ENOENT: no such file or directory, open '\
+2018/03/20, 20:05:43 "[OPT] (Budget) LOG: 0:00:00 --- Startbudget: NATO 4.5355e+006 - CSAT 4.22125e+006"
+2018/03/20, 20:06:45 "[OPT] (Budget) LOG: 0:01:02 --- NATO alt: 4.5355e+006 - neu: 4.1955e+006 - Differenz: -340000"
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Saxe (WEST) von: Selbstverschulden."
+2018/03/20, 20:10:11 "[OPT] (Abschuss) LOG: 0:04:28 --- Pumarang (WEST) von: Saxe (WEST)."
+2018/03/20, 20:10:13 "[OPT] (Budget) LOG: 0:04:30 --- CSAT alt: 2.38425e+006 - neu: 2.32425e+006 - Differenz: -60000"
+2018/03/20, 20:10:38 "[OPT] (Respawn) LOG: 0:04:55 --- Spieler: Pumarang - Kosten: 3000"
+2018/03/20, 20:15:54 "[OPT] (Punkte) LOG: 0:10:11 --- Kein Dominator (NATO 0 | CSAT 0)"
+2018/03/20, 20:17:51 "[OPT] (Abschuss) LOG: 0:12:08 --- patze (EAST) von: Wiesl (WEST)."
+2018/03/20, 20:18:20 "[OPT] (Fahne) LOG: 0:12:37 --- CSAT Flagge erobert von Wiesl"
+2018/03/20, 20:18:38 "[OPT] (Abschuss) LOG: 0:12:55 --- Nicolas (WEST) von: Wiesl (WEST)."
+2018/03/20, 20:18:59 "[OPT] (Punkte) LOG: 0:13:16 --- NATO +1 (NATO 1 | CSAT 0)"
+2018/03/20, 20:19:38 "[OPT] (Fahne) LOG: 0:13:56 --- CSAT Flagge gesichert von ALASTOR"
+2018/03/20, 20:22:18 "[OPT] (Abschuss) LOG: 0:16:35 --- Fahrzeug: Hunter-HMG (OPT_NATO) von: Murda]X[ (EAST)."
+2018/03/20, 20:37:19 "[OPT] (Transport) LOG: 0:31:36 --- Dominik (WEST) wurde von Ponykloete (WEST) eingeflogen (8666.94 m)"
+2018/03/20, 20:41:27 "[OPT] (Revive) LOG: 0:35:44 --- Bodochecker (EAST) wurde von ALASTOR (EAST) stabilisiert."
+2018/03/20, 20:41:35 "[OPT] (Revive) LOG: 0:35:52 --- Andi-de (WEST) wurde von Wiesl (WEST) wiederbelebt."
+2018/03/20, 22:35:43 "[OPT] (Mission) LOG: 2:30:00 --- Missionzeit abgelaufen"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Pumarang (WEST), PUID 76561198050321485"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Mercurat (WEST), PUID 76561198278842491"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- KalleK (EAST), PUID 76561197977676036"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- MAPster (EAST), PUID 76561198009882133"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- LyrikEmu (WEST), PUID 76561198218910400"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Philipp (EAST), PUID 76561198041792069"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Wiesl (WEST), PUID 76561198059648090"
+2018/03/20, 22:35:43 "[OPT] (Fraktionsuebersicht) LOG: 2:30:00 --- Murda]X[ (EAST), PUID 76561197971121630"
+2018/03/20, 22:35:43 "[OPT] (Budget) LOG: 2:30:00 --- Endbudget: (NATO 1997000 | CSAT 512000)"
+2018/03/20, 22:35:43 "[OPT] (Punkte) LOG: 2:30:00 --- Endpunktestand: (NATO 34 | CSAT 25)"'
--- a/server/apib/dredd/data/tmp-resource/rank/5aba5504eadcce6332c6a775.png
+++ b/server/apib/dredd/data/tmp-resource/rank/5aba5504eadcce6332c6a775.png
--- a/server/apib/dredd/data/tmp-resource/rank/5abeb1b995cf43205225710a.png
+++ b/server/apib/dredd/data/tmp-resource/rank/5abeb1b995cf43205225710a.png
--- a/server/apib/dredd/data/tmp-resource/rank/5abeb23995cf43205225710b.png
+++ b/server/apib/dredd/data/tmp-resource/rank/5abeb23995cf43205225710b.png
@ -0,0 +1,2 @@
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX/TQBcNTh/AAAAAXRSTlMA
+QObYZgAAAApJREFUeJxjYgAAAAYAAzY3fKgAAAAASUVORK5CYII=
--- a/server/apib/dredd/data/tmp-resource/rank/5bcc82db107007751b76da91.png
+++ b/server/apib/dredd/data/tmp-resource/rank/5bcc82db107007751b76da91.png
@ -0,0 +1,2 @@
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX/TQBcNTh/AAAAAXRSTlMA
+QObYZgAAAApJREFUeJxjYgAAAAYAAzY3fKgAAAAASUVORK5CYII=
--- a/server/apib/dredd/data/tmp-resource/signature/5ab68d42f547ed304064e5f7.png
+++ b/server/apib/dredd/data/tmp-resource/signature/5ab68d42f547ed304064e5f7.png
--- a/server/apib/dredd/data/tmp-resource/signature/big/5ab68d42f547ed304064e5f7.png
+++ b/server/apib/dredd/data/tmp-resource/signature/big/5ab68d42f547ed304064e5f7.png
--- a/server/apib/dredd/data/tmp-resource/squad/5aba54eaeadcce6332c6a774.png
+++ b/server/apib/dredd/data/tmp-resource/squad/5aba54eaeadcce6332c6a774.png
--- a/server/apib/dredd/data/tmp-resource/squad/5abe166f8b7488392a623f12.png
+++ b/server/apib/dredd/data/tmp-resource/squad/5abe166f8b7488392a623f12.png
@ -0,0 +1,2 @@
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX/TQBcNTh/AAAAAXRSTlMA
+QObYZgAAAApJREFUeJxjYgAAAAYAAzY3fKgAAAAASUVORK5CYII=
--- a/server/apib/dredd/data/tmp-resource/squad/5bcc82db107007751b76da92.png
+++ b/server/apib/dredd/data/tmp-resource/squad/5bcc82db107007751b76da92.png
@ -0,0 +1,2 @@
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX/TQBcNTh/AAAAAXRSTlMA
+QObYZgAAAApJREFUeJxjYgAAAAYAAzY3fKgAAAAASUVORK5CYII=
--- a/server/apib/dredd/data/user.json
+++ b/server/apib/dredd/data/user.json
--- a/server/apib/dredd/data/war.json
+++ b/server/apib/dredd/data/war.json
--- a/server/apib/dredd/populate-data.sh
+++ b/server/apib/dredd/populate-data.sh
--- a/server/apib/statistics/campaigns.apib
+++ b/server/apib/statistics/campaigns.apib
--- a/server/apib/statistics/logs.apib
+++ b/server/apib/statistics/logs.apib
--- a/server/apib/statistics/players.apib
+++ b/server/apib/statistics/players.apib
--- a/server/apib/statistics/wars.apib
+++ b/server/apib/statistics/wars.apib
--- a/server/config/api-url.js
+++ b/server/config/api-url.js
--- a/server/config/config.js
+++ b/server/config/config.js
--- a/server/cron-job/cron.js
+++ b/server/cron-job/cron.js
--- a/server/dredd.yml
+++ b/server/dredd.yml
--- a/server/middleware/auth-middleware.js
+++ b/server/middleware/auth-middleware.js
--- a/server/middleware/error-response.js
+++ b/server/middleware/error-response.js
--- a/server/middleware/filter-handler-mongo.js
+++ b/server/middleware/filter-handler-mongo.js
--- a/server/middleware/limitoffset-middleware-mongo.js
+++ b/server/middleware/limitoffset-middleware-mongo.js
--- a/server/middleware/permission-check.js
+++ b/server/middleware/permission-check.js
--- a/server/middleware/request-checks.js
+++ b/server/middleware/request-checks.js
--- a/server/middleware/resource-location.js
+++ b/server/middleware/resource-location.js
--- a/server/middleware/router-handling.js
+++ b/server/middleware/router-handling.js
--- a/server/middleware/validators.js
+++ b/server/middleware/validators.js
--- a/server/models/app-user.js
+++ b/server/models/app-user.js
--- a/Show More
+++ b/Show More