pull/3895/head
tidusjar 5 years ago
parent e6639bd8d4
commit b5043d0580

@ -30,7 +30,7 @@
"@ngx-translate/http-loader": "^4.0.0", "@ngx-translate/http-loader": "^4.0.0",
"@types/jquery": "^3.3.29", "@types/jquery": "^3.3.29",
"@yellowspot/ng-truncate": "^1.4.0", "@yellowspot/ng-truncate": "^1.4.0",
"angular-bootstrap-md": "^7.3.0", "angular-bootstrap-md": "^7.5.4",
"angular-router-loader": "^0.8.5", "angular-router-loader": "^0.8.5",
"angular2-template-loader": "^0.6.2", "angular2-template-loader": "^0.6.2",
"aspnet-prerendering": "^3.0.1", "aspnet-prerendering": "^3.0.1",

@ -54,10 +54,10 @@ export class AppComponent implements OnInit {
private signalrNotification: SignalRNotificationService, private signalrNotification: SignalRNotificationService,
private readonly snackBar: MatSnackBar) { private readonly snackBar: MatSnackBar) {
// const base = this.platformLocation.getBaseHrefFromDOM(); const base = '/' + (window.location.pathname.split('/')[1] || '');
// if (base.length > 1) { if (base.length > 1) {
// __webpack_public_path__ = base + "/dist/"; __webpack_public_path__ = base + "/dist/";
// } }
this.translate.addLangs(["en", "de", "fr", "da", "es", "it", "nl", "sv", "no", "pl", "pt"]); this.translate.addLangs(["en", "de", "fr", "da", "es", "it", "nl", "sv", "no", "pl", "pt"]);

@ -16,4 +16,8 @@
.loading-spinner { .loading-spinner {
margin: 10%; margin: 10%;
} }
#scroller {
height: 100vh;
overflow: scroll;
}

@ -15,7 +15,7 @@ export class DiscoverActorComponent implements AfterViewInit {
public loadingFlag: boolean; public loadingFlag: boolean;
public discoverResults: IDiscoverCardResult[] = []; public discoverResults: IDiscoverCardResult[] = [];
constructor(private searchService: SearchV2Service, constructor(private searchService: SearchV2Service,
private route: ActivatedRoute) { private route: ActivatedRoute) {
this.route.params.subscribe((params: any) => { this.route.params.subscribe((params: any) => {
@ -29,15 +29,15 @@ export class DiscoverActorComponent implements AfterViewInit {
} }
public async ngAfterViewInit() { public async ngAfterViewInit() {
this.discoverResults.forEach((result) => { // this.discoverResults.forEach((result) => {
this.searchService.getFullMovieDetails(result.id).subscribe(x => { // this.searchService.getFullMovieDetails(result.id).subscribe(x => {
result.available = x.available; // result.available = x.available;
result.approved = x.approved; // result.approved = x.approved;
result.rating = x.voteAverage; // result.rating = x.voteAverage;
result.requested = x.requested; // result.requested = x.requested;
result.url = x.homepage; // result.url = x.homepage;
}); // });
}); // });
} }
private createModel() { private createModel() {

@ -1,10 +1,10 @@
<settings-menu></settings-menu> <settings-menu></settings-menu>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Customization-Settings'"></wiki>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Customization-Settings'"></wiki>
<fieldset *ngIf="settings" class="container"> <fieldset *ngIf="settings" class="container">
<legend>Customization</legend> <legend>Customization</legend>
<div class="col-5"> <div class="col-12">
<mat-form-field> <mat-form-field>
<input matInput placeholder="Application Name" [(ngModel)]="settings.applicationName"> <input matInput placeholder="Application Name" [(ngModel)]="settings.applicationName">
</mat-form-field> </mat-form-field>
@ -47,14 +47,14 @@
<div class="form-group"> <div class="form-group">
<button mat-raised-button (click)="save()" type="submit" type="submit" id="save" color="accent">Submit</button> <button mat-raised-button (click)="save()" type="submit" type="submit" id="save" color="accent">Submit</button>
</div> </div>
<mat-form-field>
<textarea matInput [(ngModel)]="settings.customCss" placeholder="Custom CSS"></textarea>
</mat-form-field>
</div> </div>
<div class="col-7"> <!-- <div class="col-7"> -->
<mat-form-field>
<textarea matInput [(ngModel)]="settings.customCss" placeholder="Custom CSS"></textarea>
</mat-form-field>
</div>
<!-- </div> -->

@ -3,6 +3,7 @@
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Ombi-Settings'"></wiki> <wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Ombi-Settings'"></wiki>
<fieldset *ngIf="form" class="container"> <fieldset *ngIf="form" class="container">
<legend>Ombi Configuration</legend> <legend>Ombi Configuration</legend>
<form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)"> <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
<div class="col-12"> <div class="col-12">

@ -5,7 +5,7 @@
<script> <script>
var base = "/"+ (window.location.pathname.split('/')[1] || ''); var base = "/"+ (window.location.pathname.split('/')[1] || '');
document.write("<base href='" + base + "' />"); //document.write("<base href='" + base + "' />");
</script> </script>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">

@ -645,9 +645,12 @@ amdefine@>=0.0.4:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
angular-bootstrap-md@^7.3.0: angular-bootstrap-md@^7.5.4:
version "7.3.0" version "7.5.4"
resolved "https://registry.yarnpkg.com/angular-bootstrap-md/-/angular-bootstrap-md-7.3.0.tgz#cc0db9035553ffe0168049bfac9de92cfe5ee268" resolved "https://registry.yarnpkg.com/angular-bootstrap-md/-/angular-bootstrap-md-7.5.4.tgz#1e6c482729380b98aea7dec9b4d7a4f4e187e08c"
integrity sha512-LBVqSswd49hJ3YNTkXzwM0Cn1+9SQ2kVYQxX36ZjxaKNeDQKaUk3V2Rb/y8krhDJrPJh37pDzRmlCDObg37EIA==
dependencies:
tslib "^1.9.0"
angular-router-loader@^0.8.5: angular-router-loader@^0.8.5:
version "0.8.5" version "0.8.5"

Loading…
Cancel
Save