From f46798ebd9c3e760bbe8337642a1d162bff58d95 Mon Sep 17 00:00:00 2001
From: HardiReady <hardi@noarch.de>
Date: Mon, 12 Mar 2018 16:28:24 +0100
Subject: [PATCH] Include basic APIB build & clean up npm script executions

---
 api/apib/base/authentication.apib | 1 +
 api/apib/documentation.apib       | 3 +++
 api/package.json                  | 4 +++-
 package.json                      | 6 ++++--
 static/package.json               | 2 ++
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 api/apib/base/authentication.apib
 create mode 100644 api/apib/documentation.apib

diff --git a/api/apib/base/authentication.apib b/api/apib/base/authentication.apib
new file mode 100644
index 0000000..0c8163d
--- /dev/null
+++ b/api/apib/base/authentication.apib
@@ -0,0 +1 @@
+## Authentication
diff --git a/api/apib/documentation.apib b/api/apib/documentation.apib
new file mode 100644
index 0000000..d2f9ecb
--- /dev/null
+++ b/api/apib/documentation.apib
@@ -0,0 +1,3 @@
+# Operation Pandora Trigger Command Center API Documentation
+
+<!-- include(base/authentication.apib) -->
diff --git a/api/package.json b/api/package.json
index c25a03d..1006e9c 100644
--- a/api/package.json
+++ b/api/package.json
@@ -11,7 +11,8 @@
     "eslint": "$(npm bin)/eslint",
     "lint": "eslint '**/*.js'",
     "test": "mocha --require ./test/config/spec_helper.js",
-    "e2e": "NODE_ENV=test node server.js"
+    "e2e": "NODE_ENV=test node server.js",
+    "api:docs": "$(npm bin)/aglio -i ./apib/documentation.apib -o ../public/api-docs.html"
   },
   "dependencies": {
     "async": "^2.5.0",
@@ -36,6 +37,7 @@
     "supports-color": "^5.1.0"
   },
   "devDependencies": {
+    "aglio": "^2.3.0",
     "chai": "^3.5.0",
     "chai-http": "^3.0.0",
     "eslint": "^4.18.2",
diff --git a/package.json b/package.json
index bfe07e3..a6f5d7a 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,10 @@
   "scripts": {
     "start": "npm run deploy-static-prod && npm start --prefix ./api",
     "dev": "npm run deploy-static && npm run dev --prefix ./api",
-    "deploy-static": "cd ./static && $(npm bin)/ng build && ln -s ../api/resource/ ../public/resource",
-    "deploy-static:prod": "cd ./static && $(npm bin)/ng build --prod --aot && ln -s ../api/resource/ ../public/resource",
+    "deploy-static": "npm run build --prefix=static && npm run deploy-static:link-resource && npm run deploy-static:api-docs",
+    "deploy-static:prod": "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",
diff --git a/static/package.json b/static/package.json
index f11b127..4db9976 100644
--- a/static/package.json
+++ b/static/package.json
@@ -6,6 +6,8 @@
   "angular-cli": {},
   "scripts": {
     "ng": "$(npm bin)/ng",
+    "build": "ng build",
+    "build:prod": "ng build --prod --aot",
     "start": "ng serve",
     "lint": "ng lint",
     "test": "ng test",