github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 21:03:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the buttons

Browse source
This commit is contained in:
tidusjar 2021-01-20 21:21:05 +00:00
commit f6ac59edb2
5 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
View file

@ -49,10 +49,11 @@ export class DiscoverCardComponent implements OnInit {
} else {
this.tvSearchResult = await this.searchService.getTvInfo(+this.result.id);
}
if (this.tvSearchResult?.status.length > 0 && this.tvSearchResult?.status === "404") {
if (!this.tvSearchResult || this.tvSearchResult?.status.length > 0 && this.tvSearchResult?.status === "404") {
this.hide = true;
return;
}
this.setTvDefaults(this.tvSearchResult);
this.updateTvItem(this.tvSearchResult);
@ -161,9 +162,6 @@ export class DiscoverCardComponent implements OnInit {
private setTvDefaults(x: ISearchTvResultV2) {
if(!x) {
this.hide = true;
}
if (x.imdbId) {
x.imdbId = "http://www.imdb.com/title/" + x.imdbId + "/";
} else {

8
src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html
View file

@ -1,8 +1,8 @@
<div class="right">
<mat-button-toggle-group name="discoverMode" value="{{discoverOptions}}" class="discover-filter-buttons-group">
<mat-button-toggle ngDefaultControl [class.cdk-focused]="discoverOptions === DiscoverOption.Combined" (click)="switchDiscoverMode(DiscoverOption.Combined)" [(ngModel)]="discoverOptions" value="{{DiscoverOption.Combined}}" class="discover-filter-button">{{'Discovery.Combined' | translate}}</mat-button-toggle>
<mat-button-toggle ngDefaultControl [class.cdk-focused]="discoverOptions === DiscoverOption.Movie" (click)="switchDiscoverMode(DiscoverOption.Movie)" [(ngModel)]="discoverOptions" value="{{DiscoverOption.Movie}}" class="discover-filter-button">{{'Discovery.Movies' | translate}}</mat-button-toggle>
<mat-button-toggle ngDefaultControl [class.cdk-focused]="discoverOptions === DiscoverOption.Tv" (click)="switchDiscoverMode(DiscoverOption.Tv)" [(ngModel)]="discoverOptions" value="{{DiscoverOption.Tv}}" class="discover-filter-button">{{'Discovery.Tv' | translate}}</mat-button-toggle>
<mat-button-toggle-group name="discoverMode" (change)="toggleChanged($event)" value="{{discoverOptions}}" class="discover-filter-buttons-group">
<mat-button-toggle [ngClass]="{'button-active': discoverOptions === DiscoverOption.Combined}" value="{{DiscoverOption.Combined}}" class="discover-filter-button">{{'Discovery.Combined' | translate}}</mat-button-toggle>
<mat-button-toggle [ngClass]="{'button-active': discoverOptions === DiscoverOption.Movie}" value="{{DiscoverOption.Movie}}" class="discover-filter-button">{{'Discovery.Movies' | translate}}</mat-button-toggle>
<mat-button-toggle [ngClass]="{'button-active': discoverOptions === DiscoverOption.Tv}" value="{{DiscoverOption.Tv}}" class="discover-filter-button">{{'Discovery.Tv' | translate}}</mat-button-toggle>
</mat-button-toggle-group>
</div>

9
src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
View file

@ -76,13 +76,14 @@
border-radius: 30px;
}
.discover-filter-button.cdk-focused{
.button-active{
background:$ombi-active;
}
::ng-deep .discover-filter-button .mat-button-toggle-button:focus{
outline:none;
}
}
::ng-deep .discover-filter-button .mat-button-toggle-button:focus{
outline:none;
}
.card-skeleton {

7
src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
View file

@ -3,6 +3,7 @@ import { DiscoverOption, IDiscoverCardResult } from "../../interfaces";
import { ISearchMovieResult, ISearchTvResult, RequestType } from "../../../interfaces";
import { SearchV2Service } from "../../../services";
import { StorageService } from "../../../shared/storage/storage-service";
import { MatButtonToggleChange } from '@angular/material/button-toggle';
export enum DiscoverType {
Upcoming,
@ -86,7 +87,11 @@ export class CarouselListComponent implements OnInit {
this.createInitialModel();
}
public async switchDiscoverMode(newMode: DiscoverOption) {
public async toggleChanged(event: MatButtonToggleChange) {
await this.switchDiscoverMode(event.value);
}
private async switchDiscoverMode(newMode: DiscoverOption) {
if (this.discoverOptions === newMode) {
return;
}

2
src/Ombi/ClientApp/src/app/settings/update/update.component.html
View file

@ -1,6 +1,6 @@

<settings-menu></settings-menu>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Update-Settings'"></wiki>
<wiki [path]="'https://github.com/tidusjar/Ombi/wiki/Update-Settings'"></wiki>
<div *ngIf="form" class="small-middle-container">
<fieldset>
<legend>Update Settings</legend>