Merge pull request #1 from eidng8/dev

* migrate to es5

Author: eidng8

.gitignore

@@ -3,10 +3,14 @@
 
 .idea/
 node_modules/
-www/build/
 platforms/*/
 plugins/*/
 typings/
+www/build/
+
+app/**/*.js
+
 *.swp
 .DS_Store
 Thumbs.db
+

app/app.ts

@@ -7,6 +7,7 @@ import {CrewProvider} from './providers/crew';
 import {MissionProvider} from './providers/missions';
 import {Home} from './pages/home/home';
 import {MissionList} from './pages/mission-list/mission-list';
+import {TitleCase} from './pipes/titlecase';
 
 @Component(
   {
@@ -35,9 +36,11 @@ class MyApp
     // used for an example of ngFor and navigation
     this.pages = [
       {
-        component: CrewList, title: 'Crew List',
+        component: CrewList,
+        title:     'Crew List',
       }, {
-        component: MissionList, title: 'Mission List',
+        component: MissionList,
+        title:     'Mission List',
       },
     ];
 
@@ -50,7 +53,7 @@ class MyApp
           () =>
           {
             // tslint:disable-next-line:no-string-literal
-            if('object' == typeof window['cordova'])
+            if('object' == typeof (<any>window).cordova)
             {
               // okay, so the platform is ready and our
               // plugins are available. here you can do
@@ -69,4 +72,8 @@ class MyApp
   }
 }
 
-ionicBootstrap(MyApp, [DataService, CrewProvider, MissionProvider]);
+ionicBootstrap(
+  MyApp,
+  [
+    DataService, CrewProvider, MissionProvider, TitleCase,
+  ]);

app/components/crew-item/crew-item.html

@@ -1,19 +1,22 @@
 <ion-item [crew]="crew">
-  <ion-thumbnail item-left
-                 class="star star-{{ crew.stars }} {{ unlock ? 'unlock' : '' }}">
+  <ion-thumbnail
+    item-left
+    class="star star-{{ crew.stars }} {{ unlock ? 'unlock' : '' }}">
     <img src="http://startrektimelineswiki.com{{ crew.picture }}">
   </ion-thumbnail>
 
   <h2>{{ crew.name }}</h2>
 
-  <skill-item *ngIf="skill" class="skills single" [name]="skill"
-              [value]="crew[skill][crew[skill].length - 1][crew[skill][crew[skill].length - 1].length - 1]">
+  <skill-item
+    *ngIf="skill" class="skills single" [name]="skill"
+    [value]="crew.skillValue(skill)">
   </skill-item>
 
   <p *ngIf="!skill" class="skills">
-    <span *ngFor="let skill of skills">
-      <skill-item *ngIf="crew[skill].length" [name]="skill"
-                  [value]="crew[skill][crew[skill].length - 1][crew[skill][crew[skill].length - 1].length - 1]">
+    <span *ngFor="let skill of crew.possessing">
+      <skill-item
+        [name]="skill"
+        [value]="crew.skillValue(skill)">
       </skill-item>
     </span>
   </p>

app/components/crew-item/crew-item.ts

@@ -3,8 +3,8 @@
  */
 
 import {Component, Input} from '@angular/core';
-import {ICrew, SKILLS} from '../../interface/crew';
 import {SkillItem} from '../skill-item/skill-item';
+import {CrewMember} from '../../models/crew';
 
 @Component(
   {
@@ -15,24 +15,30 @@ import {SkillItem} from '../skill-item/skill-item';
 export class CrewItem
 {
   // tslint:disable:no-unused-variable
-  @Input() private crew:ICrew;
+  @Input() private crew:CrewMember;
+
+  // noinspection JSUnusedLocalSymbols
   @Input() private skill:string;
+
+  // noinspection JSUnusedLocalSymbols
   @Input() private unlock:boolean;
 
-  private skills:string[] = SKILLS.list.abbr;
+  // private skills:string[] = SKILLS.list.abbr;
   // tslint:enable:no-unused-variable
 
-  private skillValue:number;
+  // private skillValue:number;
 
   private ngOnInit():void
   {
-    if(!this.skill)
-    {
-      return;
-    }
-
-    let val:any = this.crew[this.skill];
-    val = val[val.length - 1];
-    this.skillValue = val[val.length - 1];
+    /*
+     if(!this.skill)
+     {
+     return;
+     }
+
+     let val:any = this.crew[this.skill];
+     val = val[val.length - 1];
+     this.skillValue = val[val.length - 1];
+     */
   }
 }

app/components/list/collapsible.ts

@@ -30,22 +30,27 @@ export class Collapsible
     // instead of the list itself.
     // just to remember, event registration can't be done in constructor,
     // due to the fact that the HTML template is not processed yet.
-    this.elem.nativeElement.getElementsByTagName('ion-list-header')[0]
-      .addEventListener(
-        'click', (evt:Event) =>
-        {
-          evt.preventDefault();
-          evt.stopPropagation();
-
-          if(this.elem.nativeElement.classList.contains(CLASS_NAME))
+    let header:HTMLElement =
+      this.elem.nativeElement.getElementsByTagName('ion-list-header')[0];
+    if(header)
+    {
+      header
+        .addEventListener(
+          'click', (evt:Event) =>
           {
-            this.expend();
-          }
-          else
-          {
-            this.collapse();
-          }
-        });
+            evt.preventDefault();
+            evt.stopPropagation();
+
+            if(this.elem.nativeElement.classList.contains(CLASS_NAME))
+            {
+              this.expend();
+            }
+            else
+            {
+              this.collapse();
+            }
+          });
+    }
   }
 
   private collapse():void

app/components/mission-item/mission-item.ts

@@ -3,7 +3,7 @@
  */
 
 import {Component, Input} from '@angular/core';
-import {IMission} from '../../interface/mission';
+import {IMission} from '../../interfaces/db/mission';
 import {SkillItem} from '../skill-item/skill-item';
 
 @Component(

app/interface/crew.ts

@@ -0,0 +1,46 @@
+/**
+ * Created by JC on 2016-07-09.
+ */
+
+import {IBaseData} from './base-data';
+
+/**
+ * List of skill abbreviations
+ */
+export const SKILLS:string[] = ['cmd', 'dip', 'eng', 'med', 'sci', 'sec'];
+
+/**
+ * List of skill names
+ */
+export const SKILL_NAMES:string[] = [
+  'command', 'diplomacy', 'engineering', 'medicine', 'science', 'security',
+];
+
+/**
+ * All skill arrays are 2-dimensional, with first as star, and second as level.
+ */
+export interface ISkills
+{
+  cmd?:number[][];
+  dip?:number[][];
+  eng?:number[][];
+  med?:number[][];
+  sci?:number[][];
+  sec?:number[][];
+}
+
+/**
+ * Crew member data. It was originally called ICrew, and changed to current
+ * name to avoid confusion. The word `crew` is plural while this piece of data
+ * represents only a single crew member.
+ */
+export interface ICrewMember extends IBaseData
+{
+  uri:string;
+  picture:string;
+  character:string;
+  stars:number;
+  skills:ISkills;
+  race:string;
+  traits:string[];
+}

app/interface/base-data.ts app/interfaces/base-data.tsapp/interface/base-data.ts renamed to app/interfaces/base-data.ts

@@ -0,0 +1,102 @@
+/**
+ * Created by JC on 2016-07-09.
+ */
+
+import {IBaseData} from '../base-data';
+
+/**
+ * Constant that list out all skills found in data, by abbreviations and names.
+ */
+export const SKILLS:any = {
+  list: {
+    abbr:  ['cmd', 'dip', 'eng', 'med', 'sci', 'sec'],
+    names: [
+      'command', 'diplomacy', 'engineering', 'medicine', 'science', 'security',
+    ],
+  },
+
+  // tslint:disable-next-line:object-literal-sort-keys
+  abbr: {
+    cmd: 'command',
+    dip: 'diplomacy',
+    eng: 'engineering',
+    med: 'medicine',
+    sci: 'science',
+    sec: 'security',
+  },
+
+  command:     'cmd',
+  diplomacy:   'dip',
+  engineering: 'eng',
+  medicine:    'med',
+  science:     'sci',
+  security:    'sec',
+};
+
+/**
+ * Crew data structure as stored in database.
+ *
+ * All skill arrays are 2-dimensional, with first as star, and second as level.
+ */
+export interface IDBCrew extends IBaseData
+{
+  /**
+   * URI to the wiki page
+   */
+  uri:string;
+
+  /**
+   * URI to the portrait picture
+   */
+  picture:string;
+
+  /**
+   * Original TV Character
+   */
+  character:string;
+
+  /**
+   * Rarity
+   */
+  stars:number;
+
+  /**
+   * Command skills
+   */
+  cmd?:number[][];
+
+  /**
+   * Diplomacy skills
+   */
+  dip?:number[][];
+
+  /**
+   * Engineer skills
+   */
+  eng?:number[][];
+
+  /**
+   * Medicine skills
+   */
+  med?:number[][];
+
+  /**
+   * Science skills
+   */
+  sci?:number[][];
+
+  /**
+   * Security skills
+   */
+  sec?:number[][];
+
+  /**
+   * Race
+   */
+  race:string;
+
+  /**
+   * Traits
+   */
+  traits:string[];
+}