Cleanup and lint

Author: adriancarriger

package.json

@@ -12,7 +12,7 @@
     "pree2e": "webdriver-manager update",
     "e2e": "protractor"
   },
-  "private": true,
+  "private": false,
   "dependencies": {
     "@angular/common": "2.0.0-rc.1",
     "@angular/compiler": "2.0.0-rc.1",

src/app/app.component.ts

@@ -17,10 +17,9 @@ import { PreloadService } from './services/preload.service';
 import { ApiObservableService } from './services/api-observable.service';
 import { SermonsPageComponent } from './+sermons-page';
 
-
 @Component({
   moduleId: module.id,
-  selector: 'app-root',
+  selector: 'as-app-root',
   templateUrl: 'app.component.html',
   styleUrls: ['app.component.css'],
   encapsulation: ViewEncapsulation.None,

src/app/components/navbar/navbar.component.ts

@@ -5,12 +5,20 @@ import {ROUTER_DIRECTIVES} from '@angular/router';
 import {ApiObservableService} from '../../services/api-observable.service';
 import {PvLogoComponent} from '../pv-logo/index';
 
+// I don't think we need: CORE_DIRECTIVES, DROPDOWN_DIRECTIVES, ApiObservableService -- double check
+
 @Component({
   moduleId: module.id,
   selector: 'as-navbar',
   templateUrl: 'navbar.component.html',
   styleUrls: ['navbar.component.css'],
-  directives: [DROPDOWN_DIRECTIVES, CollapseDirective, CORE_DIRECTIVES, ROUTER_DIRECTIVES, PvLogoComponent],
+  directives: [
+    DROPDOWN_DIRECTIVES,
+    CollapseDirective,
+    CORE_DIRECTIVES,
+    ROUTER_DIRECTIVES,
+    PvLogoComponent
+  ],
   providers: [ApiObservableService]
 })
 export class NavbarComponent implements OnInit {

src/app/components/pv-logo/pv-logo.component.spec.ts

@@ -1,46 +1,2 @@
-import {
-  beforeEach,
-  beforeEachProviders,
-  describe,
-  expect,
-  it,
-  inject,
-} from '@angular/core/testing';
-import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
-import { Component } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { PvLogoComponent } from './pv-logo.component';
 
-describe('Component: PvLogo', () => {
-  let builder: TestComponentBuilder;
-
-  beforeEachProviders(() => [PvLogoComponent]);
-  beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) {
-    builder = tcb;
-  }));
-
-  it('should inject the component', inject([PvLogoComponent],
-      (component: PvLogoComponent) => {
-    expect(component).toBeTruthy();
-  }));
-
-  it('should create the component', inject([], () => {
-    return builder.createAsync(PvLogoComponentTestController)
-      .then((fixture: ComponentFixture<any>) => {
-        let query = fixture.debugElement.query(By.directive(PvLogoComponent));
-        expect(query).toBeTruthy();
-        expect(query.componentInstance).toBeTruthy();
-      });
-  }));
-});
-
-@Component({
-  selector: 'test',
-  template: `
-    <app-pv-logo></app-pv-logo>
-  `,
-  directives: [PvLogoComponent]
-})
-class PvLogoComponentTestController {
-}
 

src/app/components/pv-logo/pv-logo.component.ts

@@ -1,16 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   moduleId: module.id,
   selector: 'as-pv-logo',
   templateUrl: 'pv-logo.component.html',
   styleUrls: ['pv-logo.component.css']
 })
-export class PvLogoComponent implements OnInit {
-
-  constructor() {}
-
-  ngOnInit() {
-  }
-
+export class PvLogoComponent {
 }

src/app/components/sermons-list/sermons-list.component.html

@@ -1,5 +1,5 @@
 <div class="sermons container">
-  <div *ngFor="let sermon of sermons | asSearchSermons:filterValues?.term:filterValues?.box1:filterValues?.box2:filterValues?.box3:filteredCount | orderBy:'Special':filterValues?.box1:filteredItems | paginate: config; let i = index"
+  <div *ngFor="let sermon of sermons | asSearchSermons:filterValues?.term:filterValues?.box1:filterValues?.box2:filterValues?.box3:filteredCount | asOrderBy:'Special':filterValues?.box1:filteredItems | paginate: config; let i = index"
     class="sermon-container"
     [ngClass]="{'playing': current?.playing && current?.id == sermon?.key, 'current-sermon': current?.id == sermon?.key}">
     <div class="sermon-art" (click)="current?.playing && current?.id === sermon?.key ? audioService.pause(): audioService.play(sermon?.key)">

src/app/pipes/order-by.pipe.ts

@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-    name: 'orderBy'
+    name: 'asOrderBy'
 })
 export class OrderBy implements PipeTransform {
   static _orderByComparator(a: any, b: any): number {
@@ -31,7 +31,7 @@ export class OrderBy implements PipeTransform {
 
     let splitOn = /[\s:\s-]+/;
     if (config === 'verse') {
-        let result = input.sort( (a,b) => {
+        let result = input.sort( (a, b) => {
             let x = a.verse.split(splitOn);
             let y = b.verse.split(splitOn);
             let sortLength = Math.min(x.length, y.length);
@@ -62,7 +62,7 @@ export class OrderBy implements PipeTransform {
     } else {
         // Loop over property of the array in order and sort
         return input.sort(function(a: any, b: any) {
-            for(let i = 0; i < config.length; i++) {
+            for (let i = 0; i < config.length; i++) {
                 let desc = config[i].substr(0, 1) === '-';
                 let property = config[i].substr(0, 1) === '+' || config[i].substr(0, 1) === '-'
                     ? config[i].substr(1)

src/app/pipes/search-sermons.pipe.ts

@@ -1,8 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import * as moment from 'moment';
 
-const momentConstructor: (value?: any) => moment.Moment = (<any>moment).default || moment;
-
 @Pipe({
   name: 'asSearchSermons'
 })
@@ -39,12 +37,12 @@ export class SearchSermons implements PipeTransform {
       }
       // Search terms
       if (term.length) {
-        let speaker = (item.speaker).replace('Pastor ','');
+        let speaker = (item.speaker).replace('Pastor ', '');
         let str = (
-          item.name + ' ' + 
-          sermonVerse + ' ' + 
-          sermonYear + ' ' + 
-          sermonDate + ' ' + 
+          item.name + ' ' +
+          sermonVerse + ' ' +
+          sermonYear + ' ' +
+          sermonDate + ' ' +
           speaker).toLowerCase();
         for (let i = 0 ; i < queries.length; i++) {
             if (str.indexOf( queries[i] ) === -1) { return false; }

src/app/services/audio.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, EventEmitter, Renderer } from '@angular/core';
+import { Injectable, Renderer } from '@angular/core';
 import { ApiObservableService } from './api-observable.service';
 import { Subject } from 'rxjs/Subject';
 import * as moment from 'moment';
@@ -20,7 +20,7 @@ export class AudioService {
     art: {},
     randomClass: ''
   };
-  public audioObjects = {}
+  public audioObjects = {};
   public sermons;
   constructor(public apiObservableService: ApiObservableService, public renderer: Renderer) {
     this.preCurrentAudio$ = new Subject();
@@ -39,7 +39,7 @@ export class AudioService {
       // Create new audio object
       if (!(this.current.id in this.audioObjects)) {
         this.audioObjects[this.current.id] = new Audio();
-        this.audioObjects[this.current.id].src = this.sermons[this.current.id]['audio'];
+        this.audioObjects[this.current.id].src = this.sermons[this.current.id].audio;
         this.current.init = true;
         this.metaData = this.renderer.listen(
           this.audioObjects[this.current.id], 'timeupdate', (event) => {
@@ -86,8 +86,8 @@ export class AudioService {
   }
 
   updatePosition() {
-    let duration = ~~this.audioObjects[this.current.id].duration;
-    let position = ~~this.audioObjects[this.current.id].currentTime;
+    let duration = Math.floor(this.audioObjects[this.current.id].duration);
+    let position = Math.floor(this.audioObjects[this.current.id].currentTime);
     let percentage = (position / duration) * 100;
     let displayPosition = this.displayTime(position);
     this.preAudioPosition$.next({
@@ -120,8 +120,8 @@ export class AudioService {
   }
 
   setPosition(percentage) {
-    let newPosition = ~~this.audioObjects[this.current.id].duration * percentage * 0.01;
+    let newPosition = Math.floor(this.audioObjects[this.current.id].duration * percentage * 0.01);
     this.audioObjects[this.current.id].currentTime = newPosition;
   }
-  
+
 }

src/app/services/bible.service.ts

@@ -2,8 +2,6 @@ import { Injectable } from '@angular/core';
 
 @Injectable()
 export class BibleService {
-
-  constructor() {}
   books() {
     return [
       'Genesis',         'Exodus',          'Leviticus',     'Numbers',

src/app/services/test-service.service.spec.ts

@@ -16,7 +16,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
-  <app-root>Loading...</app-root>
+  <as-app-root>Loading...</as-app-root>
   <!-- TODO: Move Firebase to system-config -->
   <script src="https://cdn.firebase.com/js/client/2.4.2/firebase.js"></script>
   {{#each scripts.polyfills}}