socialnetworknews-web

A open-source Paper.li clone
git clone git://archive.git.mtrnord.blog/SocialNetworkNews/socialnetworknews-web.git
Log | Files | Refs | README | LICENSE

commit 2cd21c17872690606cdf7b263368a4d4e2393d9b
parent 9e856ae9b06a335e84381685b49788eba7e1f229
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 19 May 2018 18:43:28 +0200

Fix #29

Diffstat:
Msrc/app/api.service.ts | 15++++-----------
Msrc/app/callback/twitter/twitter.component.ts | 4++--
2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/app/api.service.ts b/src/app/api.service.ts @@ -1,5 +1,6 @@ -import {Injectable} from '@angular/core'; +import {Inject, Injectable} from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import {DOCUMENT} from '@angular/common'; import {Observable} from 'rxjs'; export interface Tweet { @@ -46,16 +47,8 @@ export class ApiService { userUUID: string; inCallback: boolean; - /*constructor(@Inject(PLATFORM_ID) private platformId, private injector: Injector, @Inject(DOCUMENT) private document, private http: HttpClient) { - if (isPlatformServer(this.platformId)) { - const req = this.injector.get('request'); - this.url = req.get('host') + '/api'; - } else { - this.url = document.location.protocol + '//' + document.location.hostname + '/api'; - } - }*/ - - constructor(private http: HttpClient) { + constructor(@Inject(DOCUMENT) private document, private http: HttpClient) { + this.url = document.location.protocol + '//' + document.location.hostname + '/api'; } // Uses http.get() to load data from a single API endpoint diff --git a/src/app/callback/twitter/twitter.component.ts b/src/app/callback/twitter/twitter.component.ts @@ -1,11 +1,11 @@ import {throwError as observableThrowError, of} from 'rxjs'; import {delay, mergeMap, retryWhen, take, concat} from 'rxjs/operators'; -import {Component, Inject, OnInit, Optional} from '@angular/core'; +import {Component, Inject, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {ToastrService} from 'ngx-toastr'; import {HttpClient} from '@angular/common/http'; -import {APP_BASE_HREF, DOCUMENT} from '@angular/common'; +import {DOCUMENT} from '@angular/common'; import {ApiService} from '../../api.service'; @Component({ selector: 'app-twitter',