#10 progress

etsuo · etsuo · commit 4299fbf963a4 · 2018-03-15T19:12:12.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "@angular/service-worker": "^5.2.8",
     "@types/moment": "^2.13.0",
     "core-js": "^2.4.1",
+    "localforage": "^1.6.0",
     "moment": "^2.21.0",
     "normalize.css": "^8.0.0",
     "rxjs": "^5.5.6",
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -10,12 +10,14 @@ import {AppComponent}        from './app.component';
 import {SharedModule}        from './shared/shared.module';
 
 @Injectable()
-class MockSwUpdate {
+export class MockSwUpdate {
   available(): Observable<any> {
     return Observable.of();
   }
 }
 
+export const MockSwProvider = {provide: SwUpdate, useClass: MockSwUpdate};
+
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed
@@ -28,7 +30,7 @@ describe('AppComponent', () => {
           AppComponent
         ],
         providers: [
-          {provide: SwUpdate, useClass: MockSwUpdate}
+          MockSwProvider
         ]
       }).compileComponents();
   }));
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,9 +1,11 @@
 import {
   Component,
   OnInit
-}                   from '@angular/core';
-import {SwUpdate}   from '@angular/service-worker';
-import {LogService} from './shared/services/log.service';
+}                            from '@angular/core';
+import {SwUpdate}            from '@angular/service-worker';
+import {BrowserService}      from './shared/services/browser.service';
+import {LogService}          from './shared/services/log.service';
+import {LocalStorageService} from './shared/services/storage.service';
 
 @Component({
   selector: 'app-root',
@@ -12,11 +14,13 @@ import {LogService} from './shared/services/log.service';
 })
 export class AppComponent implements OnInit {
 
-  constructor(private log: LogService,
+  constructor(private browser: BrowserService,
+              private log: LogService,
+              private store: LocalStorageService,
               private swUpdate: SwUpdate) {
   }
 
-  ngOnInit() {
+  async ngOnInit() {
     if (this.swUpdate.isEnabled) {
       this
         .swUpdate
@@ -25,7 +29,7 @@ export class AppComponent implements OnInit {
           this.log.info('Service worker update available');
 
           if (confirm('A new version of the site is available. Reload?')) {
-            window.location.reload();
+            this.browser.window.location.reload();
           }
         });
     }
diff --git a/src/app/home/home.component.spec.ts b/src/app/home/home.component.spec.ts
@@ -5,6 +5,7 @@ import {
   TestBed
 }                                from '@angular/core/testing';
 import {NoopAnimationsModule}    from '@angular/platform-browser/animations';
+import {MockSwProvider}          from '../app.component.spec';
 import {SharedModule}            from '../shared/shared.module';
 import {HomeComponent}           from './home.component';
 
@@ -22,6 +23,9 @@ describe('HomeComponent', () => {
           HttpClientTestingModule,
           NoopAnimationsModule,
           SharedModule
+        ],
+        providers: [
+          MockSwProvider
         ]
       })
       .compileComponents();
diff --git a/src/app/shared/components/feature-card/feature-card-state.service.spec.ts b/src/app/shared/components/feature-card/feature-card-state.service.spec.ts
@@ -1,12 +1,21 @@
-import { TestBed, inject } from '@angular/core/testing';
+import {
+  inject,
+  TestBed
+}                       from '@angular/core/testing';
+import {MockSwProvider} from '../../../app.component.spec';
+import {SharedModule}   from '../../shared.module';
 
-import { FeatureCardStateService } from './feature-card-state.service';
+import {FeatureCardStateService} from './feature-card-state.service';
 
 describe('FeatureCardStateService', () => {
   beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [FeatureCardStateService]
-    });
+    TestBed
+      .configureTestingModule({
+        imports: [SharedModule],
+        providers: [
+          MockSwProvider
+        ]
+      });
   });
 
   it('should be created', inject([FeatureCardStateService], (service: FeatureCardStateService) => {
diff --git a/src/app/shared/components/feature-card/feature-card.component.spec.ts b/src/app/shared/components/feature-card/feature-card.component.spec.ts
@@ -4,6 +4,7 @@ import {
   ComponentFixture,
   TestBed
 }                                from '@angular/core/testing';
+import {MockSwProvider}          from '../../../app.component.spec';
 import {SharedModule}            from '../../shared.module';
 
 import {FeatureCardComponent} from './feature-card.component';
@@ -18,6 +19,9 @@ describe('FeatureCardComponent', () => {
         imports: [
           HttpClientTestingModule,
           SharedModule
+        ],
+        providers: [
+          MockSwProvider
         ]
       })
       .compileComponents();
diff --git a/src/app/shared/components/feature-card/feature-card.component.ts b/src/app/shared/components/feature-card/feature-card.component.ts
@@ -5,7 +5,7 @@ import {
   Input,
   OnInit
 }                                from '@angular/core';
-import {GithubService}           from '../../services/github.service';
+import {BrowserService}          from '../../services/browser.service';
 import {FeatureCardStateService} from './feature-card-state.service';
 
 @Component({
@@ -25,8 +25,8 @@ export class FeatureCardComponent implements OnInit {
     return this.hidden ? 'none' : '';
   }
 
-  constructor(private cardState: FeatureCardStateService,
-              private github: GithubService) {
+  constructor(private browser: BrowserService,
+              private cardState: FeatureCardStateService) {
     this.borderColor = cardState.nextColor();
   }
 
@@ -35,7 +35,7 @@ export class FeatureCardComponent implements OnInit {
 
   @HostListener('click')
   onClick() {
-    window.location.href = this.href;
+    this.browser.window.location.href = this.href;
   }
 
 }
diff --git a/src/app/shared/components/projects-cards/projects-cards.component.spec.ts b/src/app/shared/components/projects-cards/projects-cards.component.spec.ts
@@ -4,6 +4,7 @@ import {
   ComponentFixture,
   TestBed
 }                                from '@angular/core/testing';
+import {MockSwProvider}          from '../../../app.component.spec';
 import {SharedModule}            from '../../shared.module';
 
 import {ProjectsCardsComponent} from './projects-cards.component';
@@ -18,6 +19,9 @@ describe('ProjectsCardsComponent', () => {
         imports: [
           HttpClientTestingModule,
           SharedModule
+        ],
+        providers: [
+          MockSwProvider
         ]
       })
       .compileComponents();
diff --git a/src/app/shared/rxjs-imports.ts b/src/app/shared/rxjs-imports.ts
@@ -1,7 +1,9 @@
 import 'rxjs/add/observable/defer';
 import 'rxjs/add/observable/from';
+import 'rxjs/add/observable/fromPromise';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/forkJoin';
 
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/concatMap';
diff --git a/src/app/shared/services/browser.service.spec.ts b/src/app/shared/services/browser.service.spec.ts
@@ -0,0 +1,25 @@
+import {
+  inject,
+  TestBed
+}                       from '@angular/core/testing';
+import {MockSwProvider} from '../../app.component.spec';
+import {SharedModule}   from '../shared.module';
+
+import {BrowserService} from './browser.service';
+
+describe('BrowserService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        SharedModule
+      ],
+      providers: [
+        MockSwProvider
+      ]
+    });
+  });
+
+  it('should be created', inject([BrowserService], (service: BrowserService) => {
+    expect(service).toBeTruthy();
+  }));
+});
diff --git a/src/app/shared/services/browser.service.ts b/src/app/shared/services/browser.service.ts
@@ -0,0 +1,40 @@
+import {Injectable} from '@angular/core';
+import {SwUpdate}   from '@angular/service-worker';
+
+@Injectable()
+export class BrowserService {
+
+  constructor(private swWorker: SwUpdate) {
+  }
+
+  get hasSessionStorage(): boolean {
+    return 'sessionStorage' in this.window;
+  }
+
+  get hasLocalStorage(): boolean {
+    return 'localStorage' in this.window;
+  }
+
+  get hasCache(): boolean {
+    return 'caches' in this.window;
+  }
+
+  get hasServiceWorker(): boolean {
+    // https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker
+    return this.swWorker.isEnabled;
+  }
+
+  get document(): Document {
+    // https://developer.mozilla.org/en-US/docs/Web/API/Document
+    return document;
+  }
+
+  get window(): Window {
+    // https://developer.mozilla.org/en-US/docs/Web/API/Window
+    return window;
+  }
+
+  get sessionStorage(): WindowSessionStorage {
+    return (this.window || {} as any).sessionStorage || null;
+  }
+}
diff --git a/src/app/shared/services/github.service.spec.ts b/src/app/shared/services/github.service.spec.ts
@@ -3,6 +3,7 @@ import {
   HttpTestingController
 }                             from '@angular/common/http/testing';
 import {TestBed}              from '@angular/core/testing';
+import {MockSwProvider}       from '../../app.component.spec';
 import {orgReposResponseJson} from '../models/github-repo.spec';
 import {SharedModule}         from '../shared.module';
 
@@ -20,6 +21,9 @@ describe('GithubService', () => {
         imports: [
           HttpClientTestingModule,
           SharedModule
+        ],
+        providers: [
+          MockSwProvider
         ]
       });
 
diff --git a/src/app/shared/services/github.service.ts b/src/app/shared/services/github.service.ts
@@ -1,7 +1,9 @@
 import {Injectable}       from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
 import {GithubRepo}       from '../models/github-repo';
+import {BrowserService}   from './browser.service';
 import {GithubApiService} from './http/github-api.service';
+import {LogService}       from './log.service';
 
 const cacheOptions = {
   repoCacheLife: 1000 * 60 * 60, // 60 min
@@ -14,7 +16,9 @@ export class GithubService {
 
   private repoCache$: Observable<GithubRepo[]>;
 
-  constructor(private api: GithubApiService) {
+  constructor(private api: GithubApiService,
+              private browser: BrowserService,
+              private log: LogService) {
   }
 
   /**
@@ -26,9 +30,16 @@ export class GithubService {
   getRepositories(): Observable<GithubRepo[]> {
 
     if (!this.repoCache$) {
+      this.log.debug('repoCache$ miss');
+
       this
         .repoCache$ = Observable
         .defer(() => {
+          if (!this.browser.hasServiceWorker && this.browser.hasCache) {
+            // probably running in non-production mode
+          }
+
+          // return Observable.of([]);
           return this
             .api
             .get('/orgs/sakuraapi/repos', {observe: 'response'})
diff --git a/src/app/shared/services/storage.service.spec.ts b/src/app/shared/services/storage.service.spec.ts
diff --git a/src/app/shared/services/storage.service.ts b/src/app/shared/services/storage.service.ts
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import {`
`5`	`5`	`Input,`
`6`	`6`	`OnInit`
`7`	`7`	`} from '@angular/core';`
`8`		`-import {GithubService} from '../../services/github.service';`
	`8`	`+import {BrowserService} from '../../services/browser.service';`
`9`	`9`	`import {FeatureCardStateService} from './feature-card-state.service';`
`10`	`10`
`11`	`11`	`@Component({`
`@@ -25,8 +25,8 @@ export class FeatureCardComponent implements OnInit {`
`25`	`25`	`return this.hidden ? 'none' : '';`
`26`	`26`	`}`
`27`	`27`
`28`		`- constructor(private cardState: FeatureCardStateService,`
`29`		`- private github: GithubService) {`
	`28`	`+ constructor(private browser: BrowserService,`
	`29`	`+ private cardState: FeatureCardStateService) {`
`30`	`30`	`this.borderColor = cardState.nextColor();`
`31`	`31`	`}`
`32`	`32`
`@@ -35,7 +35,7 @@ export class FeatureCardComponent implements OnInit {`
`35`	`35`
`36`	`36`	`@HostListener('click')`
`37`	`37`	`onClick() {`
`38`		`- window.location.href = this.href;`
	`38`	`+ this.browser.window.location.href = this.href;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`