private _authService: AuthService,
private _router: Router
) {
- if (localStorage.getItem('access_token')) this.isLoggedIn = true;
- else this.isLoggedIn = false;
+ if (localStorage.getItem('access_token')) {
+ this.isLoggedIn = true;
+ } else {
+ this.isLoggedIn = false;
+ }
this._authService.loginChanged$.subscribe(
status => {
}
},
error => alert(error)
- )
+ );
}
quitFriends() {
alert('Quit friends!');
},
error => alert(error)
- )
+ );
}
}
-import {Injectable} from 'angular2/core';
-import {Http, Response, Headers, RequestOptions} from 'angular2/http';
-import {Observable} from 'rxjs/Rx';
+import { Injectable } from 'angular2/core';
+import { Http, Response } from 'angular2/http';
+import { Observable } from 'rxjs/Rx';
@Injectable()
export class FriendsService {
import { Http, Response, Headers, URLSearchParams } from 'angular2/http';
import { Observable, Subject } from 'rxjs/Rx';
-import { Token } from '../models/token';
import { AuthStatus } from '../models/authStatus';
@Injectable()
export class AuthService {
+ loginChanged$ = this._loginChanged.asObservable();
+
private _loginChanged = new Subject<AuthStatus>();
private _baseLoginUrl = '/api/v1/users/token';
private _clientId = '56f055587305d40b21904240';
private _clientSecret = 'megustalabanana';
- loginChanged$ = this._loginChanged.asObservable();
-
constructor (private http: Http) {}
login(username: string, password: string) {
let options = {
headers: headers
- }
+ };
return this.http.post(this._baseLoginUrl, body.toString(), options)
.map(res => res.json())
-import { Component, ElementRef, Inject, OnInit } from 'angular2/core';
+import { Component, ElementRef, OnInit } from 'angular2/core';
import { Router } from 'angular2/router';
-import { NgForm } from 'angular2/common';
-
-import { Video } from '../../models/video';
// TODO: import it with systemjs
declare var jQuery:any;
if (this.search !== null) {
observable = this._videosService.searchVideos(this.search);
} else {
- observable = this._videosService.getVideos()
+ observable = this._videosService.getVideos();
}
observable.subscribe(
this._videosService.removeVideo(id).subscribe(
status => this.getVideos(),
error => alert(error)
- )
+ );
}
}
alert('Cannot append the file.');
console.error(err);
}
- })
- })
+ });
+ });
}
routerCanDeactivate(next: ComponentInstruction, prev: ComponentInstruction) : any {
"tsc": "tsc",
"tsc:w": "tsc -w",
"typings": "typings",
- "postinstall": "typings install"
+ "postinstall": "typings install",
+ "test": "tslint -c ./tslint.json angular/**/*.ts angular/**/**/*.ts"
},
"license": "ISC",
"dependencies": {
"zone.js": "0.5.15"
},
"devDependencies": {
+ "codelyzer": "0.0.12",
+ "tslint": "^3.7.1",
"typescript": "^1.8.2",
"typings": "^0.6.8"
}
--- /dev/null
+{
+ "rulesDirectory": ["./node_modules/codelyzer/dist/src"],
+ "rules": {
+ "class-name": true,
+ "curly": false,
+ "eofline": true,
+ "indent": ["spaces"],
+ "max-line-length": [true, 140],
+ "member-ordering": [true,
+ "public-before-private",
+ "static-before-instance",
+ "variables-before-functions"
+ ],
+ "no-arg": true,
+ "no-construct": true,
+ "no-duplicate-key": true,
+ "no-duplicate-variable": true,
+ "no-empty": true,
+ "no-eval": true,
+ "no-trailing-whitespace": true,
+ "no-unused-expression": true,
+ "no-unused-variable": true,
+ "no-unreachable": true,
+ "no-use-before-declare": true,
+ "one-line": [true,
+ "check-open-brace",
+ "check-catch",
+ "check-else",
+ "check-whitespace"
+ ],
+ "quotemark": [true, "single"],
+ "semicolon": true,
+ "trailing-comma": true,
+ "triple-equals": true,
+ "variable-name": false,
+
+ "component-selector-name": [true, "kebab-case"],
+ "component-selector-type": [true, "element"],
+ "host-parameter-decorator": true,
+ "input-parameter-decorator": true,
+ "output-parameter-decorator": true,
+ "attribute-parameter-decorator": true,
+ "input-property-directive": true,
+ "output-property-directive": true
+ }
+}
"dev": "npm run build && NODE_ENV=test concurrently \"npm run livereload\" \"npm run client:tsc:watch\" \"npm run client:sass:watch\" \"npm start\"",
"livereload": "livereload ./client",
"start": "node server",
- "test": "standard && mocha server/tests",
+ "test": "cd client && npm test && cd .. && standard && mocha server/tests",
"postinstall": "cd client && npm install"
},
"dependencies": {