djabsher
/
UIAngular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Angular 6

Transactions
Dan 2018-05-15 19:05:03 -06:00
parent bf4e2f755b
commit e5aec374fc
31 changed files with 4783 additions and 3718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Client/.angular-cli.json
View File

@ -1,61 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "client"
},
"apps": [
{
"root": "src",
"outDir": "../Server/www",
"assets": [
"assets",
"favicon.ico",
"web-app-files"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.css"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}

6
Client/.gitignore vendored
View File

@ -30,13 +30,9 @@
/coverage /coverage
/libpeerconnection.log /libpeerconnection.log
npm-debug.log npm-debug.log
yarn-error.log
testem.log testem.log
/typings /typings
yarn-error.log
# e2e
/e2e/*.js
/e2e/*.map
# System Files # System Files
.DS_Store .DS_Store

5
Client/README.md
View File

@ -1,6 +1,6 @@
# Client # Client
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.2.7. This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.1.
## Development server ## Development server
@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
## Build ## Build
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build. Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
## Running unit tests ## Running unit tests
@ -21,7 +21,6 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
## Running end-to-end tests ## Running end-to-end tests
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Before running the tests make sure you are serving the app via `ng serve`.
## Further help ## Further help

122
Client/angular.json 100644
View File

@ -0,0 +1,122 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"Client": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "../Server/www",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "Client:build"
},
"configurations": {
"production": {
"browserTarget": "Client:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "Client:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"Client-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "Client:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "Client"
}

4
Client/protractor.conf.js → Client/e2e/protractor.conf.js
View File

@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = { exports.config = {
allScriptsTimeout: 11000, allScriptsTimeout: 11000,
specs: [ specs: [
'./e2e/**/*.e2e-spec.ts' './src/**/*.e2e-spec.ts'
], ],
capabilities: { capabilities: {
'browserName': 'chrome' 'browserName': 'chrome'
@ -21,7 +21,7 @@ exports.config = {
}, },
onPrepare() { onPrepare() {
require('ts-node').register({ require('ts-node').register({
project: 'e2e/tsconfig.e2e.json' project: require('path').join(__dirname, './tsconfig.e2e.json')
}); });
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
} }

8
Client/e2e/app.e2e-spec.ts → Client/e2e/src/app.e2e-spec.ts
View File

@ -1,10 +1,10 @@
import { ClientPage } from './app.po'; import { AppPage } from './app.po';
describe('client App', () => { describe('workspace-project App', () => {
let page: ClientPage; let page: AppPage;
beforeEach(() => { beforeEach(() => {
page = new ClientPage(); page = new AppPage();
}); });
it('should display welcome message', () => { it('should display welcome message', () => {

2
Client/e2e/app.po.ts → Client/e2e/src/app.po.ts
View File

@ -1,6 +1,6 @@
import { browser, by, element } from 'protractor'; import { browser, by, element } from 'protractor';
export class ClientPage { export class AppPage {
navigateTo() { navigateTo() {
return browser.get('/'); return browser.get('/');
} }

3
Client/e2e/tsconfig.e2e.json
View File

@ -1,8 +1,7 @@
{ {
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/e2e", "outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "commonjs", "module": "commonjs",
"target": "es5", "target": "es5",
"types": [ "types": [

7964
Client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

68
Client/package.json
View File

@ -1,12 +1,8 @@
{ {
"name": "client", "name": "client",
"version": "0.0.0", "version": "0.0.0",
"license": "MIT",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"servehelena": "ng serve -host 192.168.43.144",
"servebutte": "ng serve -host 192.168.2.8",
"servebutteprod": "ng serve -host 192.168.2.8 --prod",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
@ -15,41 +11,41 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^5.0.1", "@angular/animations": "^6.0.0",
"@angular/cdk": "^5.0.0-rc0", "@angular/cdk": "^6.0.2",
"@angular/common": "^5.0.1", "@angular/common": "^6.0.0",
"@angular/compiler": "^5.0.1", "@angular/compiler": "^6.0.0",
"@angular/core": "^5.0.1", "@angular/core": "^6.0.0",
"@angular/forms": "^5.0.1", "@angular/forms": "^6.0.0",
"@angular/http": "^5.0.1", "@angular/http": "^6.0.0",
"@angular/material": "^5.0.0-rc0", "@angular/material": "^6.0.2",
"@angular/platform-browser": "^5.0.1", "@angular/platform-browser": "^6.0.0",
"@angular/platform-browser-dynamic": "^5.0.1", "@angular/platform-browser-dynamic": "^6.0.0",
"@angular/router": "^5.0.1", "@angular/router": "^6.0.0",
"core-js": "^2.4.1", "core-js": "^2.5.4",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"rxjs": "^5.5.2", "rxjs": "^6.0.0",
"zone.js": "^0.8.14" "zone.js": "^0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.5.0", "@angular/compiler-cli": "^6.0.0",
"@angular/compiler-cli": "^5.0.1", "@angular-devkit/build-angular": "~0.6.1",
"@angular/language-service": "^5.0.1", "typescript": "~2.7.2",
"@types/jasmine": "~2.5.53", "@angular/cli": "~6.0.1",
"@types/jasminewd2": "~2.0.2", "@angular/language-service": "^6.0.0",
"@types/node": "~6.0.60", "@types/jasmine": "~2.8.6",
"codelyzer": "~3.2.0", "@types/jasminewd2": "~2.0.3",
"jasmine-core": "~2.6.2", "@types/node": "~8.9.4",
"jasmine-spec-reporter": "~4.1.0", "codelyzer": "~4.2.1",
"karma": "~1.7.0", "jasmine-core": "~2.99.1",
"karma-chrome-launcher": "~2.1.1", "jasmine-spec-reporter": "~4.2.1",
"karma-cli": "~1.0.1", "karma": "~1.7.1",
"karma-coverage-istanbul-reporter": "^1.2.1", "karma-chrome-launcher": "~2.2.0",
"karma-jasmine": "~1.1.0", "karma-coverage-istanbul-reporter": "~1.4.2",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.2", "protractor": "~5.3.0",
"ts-node": "~3.2.0", "ts-node": "~5.0.1",
"tslint": "~5.7.0", "tslint": "~5.9.1"
"typescript": "~2.4.2"
} }
} }

2
Client/src/app/components/sermons/sermons.component.ts
View File

@ -11,7 +11,7 @@ import { MatSnackBar, MatDialog, MatDialogConfig } from '@angular/material';
import { AddSermonPopupComponent } from '../popups/add-sermon-popup/add-sermon-popup.component'; import { AddSermonPopupComponent } from '../popups/add-sermon-popup/add-sermon-popup.component';
import 'rxjs/add/operator/switchMap';
@Component({ @Component({
selector: 'sermons-component', selector: 'sermons-component',

5
Client/src/app/services/audio-player.service.ts
View File

@ -1,9 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Sermon } from '../interfaces/sermon'; import { Sermon } from '../interfaces/sermon';
import { AudioStates } from '../enum/audio-states'; import { AudioStates } from '../enum/audio-states';
import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { BehaviorSubject, Observable, Subject } from 'rxjs';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
@Injectable() @Injectable()
export class AudioPlayerService { export class AudioPlayerService {

6
Client/src/app/services/bible-verse.service.ts
View File

@ -1,9 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Http, Response } from '@angular/http'; import { Http, Response } from '@angular/http';
import { Observable } from 'rxjs/Observable'; import { Observable, throwError as observableThrowError, observable } from 'rxjs';
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/map';
import { RANDOM_VERSE_URL } from '../constants/urls'; import { RANDOM_VERSE_URL } from '../constants/urls';
@ -29,7 +27,7 @@ export class BibleVerseService {
errMsg = error.message ? error.message : error.toString(); errMsg = error.message ? error.message : error.toString();
} }
console.error(errMsg); console.error(errMsg);
return Observable.throw(errMsg); return observableThrowError(errMsg);
} }
} }

10
Client/src/app/services/email.service.ts
View File

@ -1,4 +1,6 @@
import { Observable } from 'rxjs/Observable';
import {throwError as observableThrowError, Observable } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
import { Http, Response } from '@angular/http'; import { Http, Response } from '@angular/http';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
@ -27,8 +29,8 @@ export class EmailService {
}; };
return this.http.post(EMAIL_URL,body,{withCredentials:true}) return this.http.post(EMAIL_URL,body,{withCredentials:true})
.map(r => { return r.json(); }) .pipe(map(r => { return r.json(); })
.catch(this.dataError); ,catchError(this.dataError));
} }
@ -42,6 +44,6 @@ export class EmailService {
errMsg = error.message ? error.message : error.toString(); errMsg = error.message ? error.message : error.toString();
} }
console.error(errMsg); console.error(errMsg);
return Observable.throw(error.json()); return observableThrowError(error.json());
} }
} }

15
Client/src/app/services/event.service.ts
View File

@ -1,6 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Http, Response } from '@angular/http'; import { Http, Response } from '@angular/http';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
import { Event } from '../interfaces/event'; import { Event } from '../interfaces/event';
import { EVENTS_BY_PAGE_URL, import { EVENTS_BY_PAGE_URL,
@ -17,12 +18,12 @@ export class EventService {
getEvents(page: number): Observable<Event[]> { getEvents(page: number): Observable<Event[]> {
let url = EVENTS_BY_PAGE_URL + page + "?pageSize=" + 10; let url = EVENTS_BY_PAGE_URL + page + "?pageSize=" + 10;
return this.http.get(url).map(this.gotData,this).catch(this.dataError) return this.http.get(url).pipe(map(this.gotData,this),catchError(this.dataError));
}; };
getSingleEvent(id: Number): Observable<Event>{ getSingleEvent(id: Number): Observable<Event>{
let url = EVENT_BY_ID + id; let url = EVENT_BY_ID + id;
return this.http.get(url).map(this.gotDataSingle,this).catch(this.dataError); return this.http.get(url).pipe(map(this.gotDataSingle,this),catchError(this.dataError));
}; };
addEvent(event: Event){ addEvent(event: Event){
@ -34,14 +35,14 @@ export class EventService {
fd.append("timezoneOffset",new Date().getTimezoneOffset().toString()); fd.append("timezoneOffset",new Date().getTimezoneOffset().toString());
return this.http.post(EVENTS_ADD_URL,fd,{withCredentials:true}) return this.http.post(EVENTS_ADD_URL,fd,{withCredentials:true})
.map(d=>{ return d.json(); }) .pipe(map(d=>{ return d.json(); })
.catch(this.dataError); ,catchError(this.dataError));
} }
deleteEvent(eventId: number){ deleteEvent(eventId: number){
return this.http.delete(EVENTS_DELETE_BY_ID_URL,{withCredentials:true,body:{"id":eventId}}) return this.http.delete(EVENTS_DELETE_BY_ID_URL,{withCredentials:true,body:{"id":eventId}})
.map(d => {return d.json(); }) .pipe(map(d => {return d.json(); })
.catch(this.dataError); ,catchError(this.dataError));
} }
gotDataSingle(res: Response){ gotDataSingle(res: Response){

15
Client/src/app/services/google-analytics.service.spec.ts
View File

@ -1,15 +0,0 @@
import { TestBed, inject } from '@angular/core/testing';
import { GoogleAnalyticsService } from './google-analytics.service';
describe('GoogleAnalyticsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [GoogleAnalyticsService]
});
});
it('should be created', inject([GoogleAnalyticsService], (service: GoogleAnalyticsService) => {
expect(service).toBeTruthy();
}));
});

20
Client/src/app/services/login.service.ts
View File

@ -1,10 +1,10 @@
import {throwError as observableThrowError, Observable , Subject, of } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Http, Response, RequestOptions } from '@angular/http'; import { Http, Response, RequestOptions } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/map';
import { Sermon } from '../interfaces/sermon'; import { Sermon } from '../interfaces/sermon';
import { LOGIN_URL } from '../constants/urls'; import { LOGIN_URL } from '../constants/urls';
@ -27,8 +27,8 @@ export class LoginService {
login(username: string, password: string){ login(username: string, password: string){
return this.http.post(LOGIN_URL,{userName:username,password:password},this.options) return this.http.post(LOGIN_URL,{userName:username,password:password},this.options)
.map(r=> { return this.gotData(r);}) .pipe(map(r=> { return this.gotData(r);})
.catch(this.dataError); ,catchError(this.dataError));
} }
isLoggedIn(fromServer: boolean = false){ isLoggedIn(fromServer: boolean = false){
@ -36,17 +36,17 @@ export class LoginService {
var hours = Math.abs(now.valueOf() - this.lastLoginCheck.valueOf()) / 36e5; var hours = Math.abs(now.valueOf() - this.lastLoginCheck.valueOf()) / 36e5;
if (hours > 0.75 || fromServer === true){ if (hours > 0.75 || fromServer === true){
return this.http.post(LOGIN_URL + "/isloggedin",{},this.options) return this.http.post(LOGIN_URL + "/isloggedin",{},this.options)
.map(d => { .pipe(map(d => {
let is = d.json().loggedIn === true; let is = d.json().loggedIn === true;
this.loggedIn = is; this.loggedIn = is;
this.lastLoginCheck = new Date(); this.lastLoginCheck = new Date();
this.onChange.next({isLoggedIn: this.loggedIn}); this.onChange.next({isLoggedIn: this.loggedIn});
return this.loggedIn; return this.loggedIn;
}) })
.catch(this.dataError); ,catchError(this.dataError));
} else { } else {
let val = this.loggedIn; let val = this.loggedIn;
return Observable.of(val); return of(val);
} }
} }
@ -68,7 +68,7 @@ export class LoginService {
errMsg = error.message ? error.message : error.toString(); errMsg = error.message ? error.message : error.toString();
} }
console.error(errMsg); console.error(errMsg);
return Observable.throw(errMsg); return observableThrowError(errMsg);
} }
onLogin(): Observable<{isLoggedIn: boolean}>{ onLogin(): Observable<{isLoggedIn: boolean}>{

29
Client/src/app/services/sermon.service.ts
View File

@ -1,10 +1,11 @@
import {throwError as observableThrowError, Observable } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Http, Response } from '@angular/http'; import { Http, Response } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/map';
import { Sermon } from '../interfaces/sermon'; import { Sermon } from '../interfaces/sermon';
import { SERMONS_BY_ID, import { SERMONS_BY_ID,
@ -25,22 +26,22 @@ export class SermonService {
getSermons(count: number): Observable<Sermon[]> { getSermons(count: number): Observable<Sermon[]> {
let url = SERMONS_BY_PAGE_URL + 1 + "?pageSize=" + 5; let url = SERMONS_BY_PAGE_URL + 1 + "?pageSize=" + 5;
return this.http.get(url).map(this.gotData).catch(this.dataError); return this.http.get(url).pipe(map(this.gotData),catchError(this.dataError));
}; };
getSermonsByPage(page: number): Observable<Sermon[]>{ getSermonsByPage(page: number): Observable<Sermon[]>{
let url = SERMONS_BY_PAGE_URL + page + "?pageSize=" + this.pageSize; let url = SERMONS_BY_PAGE_URL + page + "?pageSize=" + this.pageSize;
return this.http.get(url).map(this.gotData).catch(this.dataError); return this.http.get(url).pipe(map(this.gotData),catchError(this.dataError));
} }
getSermonById(id: number): Observable<Sermon>{ getSermonById(id: number): Observable<Sermon>{
let url = SERMONS_BY_ID + id + "?pageSize=" + this.pageSize; let url = SERMONS_BY_ID + id + "?pageSize=" + this.pageSize;
return this.http.get(url).map(this.gotSermon).catch(this.dataError); return this.http.get(url).pipe(map(this.gotSermon),catchError(this.dataError));
} }
searchSermons(searchTerm: string, page: number): Observable<Sermon[]>{ searchSermons(searchTerm: string, page: number): Observable<Sermon[]>{
let url = SERMONS_BY_SEARCH_URL + "?searchTerm=" + searchTerm + "&page=" + page + "&pageSize=" + this.pageSize; let url = SERMONS_BY_SEARCH_URL + "?searchTerm=" + searchTerm + "&page=" + page + "&pageSize=" + this.pageSize;
return this.http.get(url).map(this.gotData).catch(this.dataError); return this.http.get(url).pipe(map(this.gotData),catchError(this.dataError));
} }
addSermon(sermon: Sermon, sermonFile: File){ addSermon(sermon: Sermon, sermonFile: File){
@ -52,8 +53,8 @@ export class SermonService {
fd.append("file",sermonFile); fd.append("file",sermonFile);
fd.append("timezoneOffset",new Date().getTimezoneOffset().toString()); fd.append("timezoneOffset",new Date().getTimezoneOffset().toString());
return this.http.post(SERMON_ADD_URL,fd,{withCredentials:true}) return this.http.post(SERMON_ADD_URL,fd,{withCredentials:true})
.map(d=>{ return d.json(); }) .pipe(map(d=>{ return d.json(); })
.catch(this.dataError); ,catchError(this.dataError));
} }
updateSermon(sermon: Sermon){ updateSermon(sermon: Sermon){
@ -65,15 +66,15 @@ export class SermonService {
fd.append("author",sermon.author); fd.append("author",sermon.author);
fd.append("timezoneOffset",new Date().getTimezoneOffset().toString()); fd.append("timezoneOffset",new Date().getTimezoneOffset().toString());
return this.http.put(SERMON_UPDATE_URL,fd,{withCredentials:true}) return this.http.put(SERMON_UPDATE_URL,fd,{withCredentials:true})
.map(d => { return d.json(); }) .pipe(map(d => { return d.json(); })
.catch(this.dataError); ,catchError(this.dataError));
} }
deleteSermon(sermonId: number){ deleteSermon(sermonId: number){
return this.http.delete(SERMON_DELETE_URL,{withCredentials:true,body:{"id":sermonId}}) return this.http.delete(SERMON_DELETE_URL,{withCredentials:true,body:{"id":sermonId}})
.map(d=>{ return d.json(); }) .pipe(map(d=>{ return d.json(); })
.catch(this.dataError); ,catchError(this.dataError));
} }
gotSermon(res: Response){ gotSermon(res: Response){
@ -115,6 +116,6 @@ export class SermonService {
errMsg = error.message ? error.message : error.toString(); errMsg = error.message ? error.message : error.toString();
} }
console.error(errMsg); console.error(errMsg);
return Observable.throw(errMsg); return observableThrowError(errMsg);
} }
} }

2
Client/src/app/services/xhr-progress.service.ts
View File

@ -1,4 +1,4 @@
import { Subject } from 'rxjs/Subject'; import { Subject } from 'rxjs';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';

9
Client/src/browserslist 100644
View File

@ -0,0 +1,9 @@
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
# For IE 9-11 support, please uncomment the last line of the file and adjust as needed
> 0.5%
last 2 versions
Firefox ESR
not dead
# IE 9-11

15
Client/src/environments/environment.ts
View File

@ -1,8 +1,15 @@
// The file contents for the current environment will overwrite these during build. // This file can be replaced during build by using the `fileReplacements` array.
// The build system defaults to the dev environment which uses `environment.ts`, but if you do // `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
// `ng build --env=prod` then `environment.prod.ts` will be used instead. // The list of file replacements can be found in `angular.json`.
// The list of which env maps to which file can be found in `.angular-cli.json`.
export const environment = { export const environment = {
production: false production: false
}; };
/*
* In development mode, to ignore zone related error stack frames such as
* `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
* import the following file, but please comment it out in production mode
* because it will have performance impact when throw error
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.

14
Client/karma.conf.js → Client/src/karma.conf.js
View File

@ -1,27 +1,25 @@
// Karma configuration file, see link for more information // Karma configuration file, see link for more information
// https://karma-runner.github.io/0.13/config/configuration-file.html // https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: '', basePath: '',
frameworks: ['jasmine', '@angular/cli'], frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
client:{ client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false // leave Jasmine Spec Runner output visible in browser
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ], dir: require('path').join(__dirname, '../coverage'),
reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true
}, },
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
colors: true, colors: true,

3
Client/src/main.ts
View File

@ -8,4 +8,5 @@ if (environment.production) {
enableProdMode(); enableProdMode();
} }
platformBrowserDynamic().bootstrapModule(AppModule); platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.log(err));

36
Client/src/polyfills.ts
View File

@ -37,21 +37,39 @@ import 'core-js/es6/set';
/** IE10 and IE11 requires the following for NgClass support on SVG elements */ /** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`. // import 'classlist.js'; // Run `npm install --save classlist.js`.
/** IE10 and IE11 requires the following for the Reflect API. */
// import 'core-js/es6/reflect';
/** Evergreen browsers require these. **/ /** Evergreen browsers require these. **/
import 'core-js/es6/reflect'; // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
import 'core-js/es7/reflect'; import 'core-js/es7/reflect';
/** /**
* Required to support Web Animations `@angular/animation`. * Web Animations `@angular/platform-browser/animations`
* Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
**/ **/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`. // import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
*/
// (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
// (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
// (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
/*
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
* with the following flag, it will bypass `zone.js` patch for IE/Edge
*/
// (window as any).__Zone_enable_cross_context_check = true;
/*************************************************************************************************** /***************************************************************************************************
* Zone JS is required by Angular itself. * Zone JS is required by default for Angular itself.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js/dist/zone'; // Included with Angular CLI.
@ -60,13 +78,3 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
/*************************************************************************************************** /***************************************************************************************************
* APPLICATION IMPORTS * APPLICATION IMPORTS
*/ */
/**
* Date, currency, decimal and percent pipes.
* Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
*/
// import 'intl'; // Run `npm install --save intl`.
/**
* Need to import at least one locale-data with intl.
*/
// import 'intl/locale-data/jsonp/en';

14
Client/src/test.ts
View File

@ -1,24 +1,14 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files // This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/long-stack-trace-zone'; import 'zone.js/dist/zone-testing';
import 'zone.js/dist/proxy.js';
import 'zone.js/dist/sync-test';
import 'zone.js/dist/jasmine-patch';
import 'zone.js/dist/async-test';
import 'zone.js/dist/fake-async-test';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import {
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } from '@angular/platform-browser-dynamic/testing';
// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
declare const __karma__: any;
declare const require: any; declare const require: any;
// Prevent Karma from running prematurely.
__karma__.loaded = function () {};
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
@ -28,5 +18,3 @@ getTestBed().initTestEnvironment(
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules. // And load the modules.
context.keys().map(context); context.keys().map(context);
// Finally, start Karma to run the tests.
__karma__.start();

3
Client/src/tsconfig.app.json
View File

@ -2,12 +2,11 @@
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "es2015", "module": "es2015",
"types": [] "types": []
}, },
"exclude": [ "exclude": [
"test.ts", "src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

5
Client/src/tsconfig.spec.json
View File

@ -2,16 +2,15 @@
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/spec", "outDir": "../out-tsc/spec",
"baseUrl": "./",
"module": "commonjs", "module": "commonjs",
"target": "es5",
"types": [ "types": [
"jasmine", "jasmine",
"node" "node"
] ]
}, },
"files": [ "files": [
"test.ts" "test.ts",
"polyfills.ts"
], ],
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",

17
Client/src/tslint.json 100644
View File

@ -0,0 +1,17 @@
{
"extends": "../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
]
}
}

5
Client/src/typings.d.ts vendored
View File

@ -1,5 +0,0 @@
/* SystemJS module definition */
declare var module: NodeModule;
interface NodeModule {
id: string;
}

3
Client/tsconfig.json
View File

@ -1,6 +1,7 @@
{ {
"compileOnSave": false, "compileOnSave": false,
"compilerOptions": { "compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc", "outDir": "./dist/out-tsc",
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
@ -12,7 +13,7 @@
"node_modules/@types" "node_modules/@types"
], ],
"lib": [ "lib": [
"es2016", "es2017",
"dom" "dom"
] ]
} }

24
Client/tslint.json
View File

@ -11,11 +11,14 @@
"check-space" "check-space"
], ],
"curly": true, "curly": true,
"deprecation": {
"severity": "warn"
},
"eofline": true, "eofline": true,
"forin": true, "forin": true,
"import-blacklist": [ "import-blacklist": [
true, true,
"rxjs" "rxjs/Rx"
], ],
"import-spacing": true, "import-spacing": true,
"indent": [ "indent": [
@ -103,7 +106,6 @@
"variable-declaration": "nospace" "variable-declaration": "nospace"
} }
], ],
"typeof-compare": true,
"unified-signatures": true, "unified-signatures": true,
"variable-name": false, "variable-name": false,
"whitespace": [ "whitespace": [
@ -114,18 +116,7 @@
"check-separator", "check-separator",
"check-type" "check-type"
], ],
"directive-selector": [ "no-output-on-prefix": true,
true,
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
],
"use-input-property-decorator": true, "use-input-property-decorator": true,
"use-output-property-decorator": true, "use-output-property-decorator": true,
"use-host-property-decorator": true, "use-host-property-decorator": true,
@ -134,9 +125,6 @@
"use-life-cycle-interface": true, "use-life-cycle-interface": true,
"use-pipe-transform-interface": true, "use-pipe-transform-interface": true,
"component-class-suffix": true, "component-class-suffix": true,
"directive-class-suffix": true, "directive-class-suffix": true
"no-access-missing-member": true,
"templates-use-public": true,
"invoke-injectable": true
} }
} }