fix broken PREFIX_URL feature
This commit is contained in:
@@ -27,8 +27,10 @@
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<p *ngIf="downloads.loading">Loading...</p>
|
||||
<div class="metube-section-header">Downloading</div>
|
||||
<div *ngIf="downloads.loading" class="alert alert-info" role="alert">
|
||||
Connecting to server...
|
||||
</div>
|
||||
<div class="metube-section-header">Downloading</div>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
@@ -3,14 +3,12 @@ import { NgModule } from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { SocketIoModule, SocketIoConfig } from 'ngx-socket-io';
|
||||
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
|
||||
|
||||
import { AppComponent } from './app.component';
|
||||
import { EtaPipe, SpeedPipe } from './downloads.pipe';
|
||||
import { MasterCheckboxComponent, SlaveCheckboxComponent } from './master-checkbox.component';
|
||||
|
||||
const config: SocketIoConfig = { url: '', options: {} };
|
||||
import { MeTubeSocket } from './metube-socket';
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
@@ -25,10 +23,9 @@ const config: SocketIoConfig = { url: '', options: {} };
|
||||
FormsModule,
|
||||
NgbModule,
|
||||
HttpClientModule,
|
||||
SocketIoModule.forRoot(config),
|
||||
FontAwesomeModule
|
||||
],
|
||||
providers: [],
|
||||
providers: [MeTubeSocket],
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
export class AppModule { }
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
||||
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
||||
import { of, Subject } from 'rxjs';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
import { Socket } from 'ngx-socket-io';
|
||||
import { MeTubeSocket } from './metube-socket';
|
||||
|
||||
export interface Status {
|
||||
status: string;
|
||||
@@ -31,7 +31,7 @@ export class DownloadsService {
|
||||
queueChanged = new Subject();
|
||||
doneChanged = new Subject();
|
||||
|
||||
constructor(private http: HttpClient, private socket: Socket) {
|
||||
constructor(private http: HttpClient, private socket: MeTubeSocket) {
|
||||
socket.fromEvent('all').subscribe((strdata: string) => {
|
||||
this.loading = false;
|
||||
let data: [[[string, Download]], [[string, Download]]] = JSON.parse(strdata);
|
||||
|
||||
9
ui/src/app/metube-socket.ts
Normal file
9
ui/src/app/metube-socket.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Socket } from 'ngx-socket-io';
|
||||
|
||||
@Injectable()
|
||||
export class MeTubeSocket extends Socket {
|
||||
constructor() {
|
||||
super({ url: '', options: {path: document.location.pathname + 'socket.io'} });
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user