Merge branch 'task/minified-ng-output' of hardi/opt-cc into master

minify.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# array of files to minify
+FILES=(inline main polyfills scripts styles vendor)
+OPTIONS="-c toplevel,dead_code=true,unused=true"
+
+for i in "${FILES[@]}"
+do
+  echo "minify ${i} ..."
+  $(npm bin)/uglifyjs public/${i}.bundle.js ${OPTIONS} -o public/${i}.bundle.js
+done

package.json

@@ -7,7 +7,8 @@
     "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 --env=prod && ln -s ../api/resource/ ../public/resource",
+    "deploy-static-prod": "cd ./static && $(npm bin)/ng build --env=prod && ln -s ../api/resource/ ../public/resource && cd .. && npm run deploy-minify",
+    "deploy-minify": "./minify.sh",
     "postinstall": "npm install --prefix ./static && npm install --prefix  ./api",
     "mongodb": "mkdir -p mongodb-data && mongod --dbpath ./mongodb-data",
     "test": "npm test --prefix ./api",

static/src/app/models/model-interfaces.ts

@@ -11,7 +11,7 @@ export interface User {
   _id?: string;
   boardUserId?: number;
   username?: string;
-  squad?: Squad;
+  squad?: any; //Squad or string
   rank?: Rank;
   awards?: Award[];
 }
@@ -54,7 +54,7 @@ export interface Rank {
 export interface Award {
   _id?: string,
   userId: string,
-  decorationId?: Decoration;
+  decorationId?: any; //Decoration or string
   reason?: string;
   proposer?: AppUser;
   date?: number; // since Date.now() returns a number

static/src/app/request/award/req-award.component.ts

@@ -79,7 +79,7 @@ export class RequestAwardComponent {
 
   addAwarding(previewImage, descriptionField) {
     if (this.decoration._id && this.reason.length > 0) {
-      const award = {
+      const award : Award = {
         "userId": this.user._id,
         "decorationId": this.decoration._id,
         "reason": this.reason,

static/src/app/users/edit-user/edit-user.component.html

@@ -4,7 +4,7 @@
 
   <div class="form-group">
     <label for="title">Name</label>
-    <input type="text" class="form-control"
+    <input class="form-control"
            [(ngModel)]="user.username"
            name="title"
            id="title"

static/src/tsconfig.app.json

@@ -1,10 +1,10 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-  "lib": [
-    "es2016",
-    "dom"
-  ],
+    "lib": [
+      "es2016",
+      "dom"
+    ],
     "outDir": "../out-tsc/app",
     "target": "es5",
     "module": "es2015",

static/tsconfig.json

@@ -2,7 +2,7 @@
   "compileOnSave": false,
   "compilerOptions": {
     "outDir": "./dist/out-tsc",
-    "sourceMap": true,
+    "sourceMap": false,
     "declaration": false,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,