Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed trakt image not loading when base url present #4711

Merged
merged 2 commits into from
Aug 4, 2022
Merged

fix: fixed trakt image not loading when base url present #4711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1ac296
fix: fixed trakt image not loading when base url present
tidusjar Jul 30, 2022
9f13aef
Merge branch 'develop' into local-image
mergify[bot] Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Ombi/ClientApp/src/app/components/image/image.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<img src="{{src}}" (onError)="onError($event)" [class]="class" [id]="id" [style]="style"/>
<img src="{{src}}" (error)="onError($event)" [class]="class" [id]="id" [style]="style"/>
2 changes: 2 additions & 0 deletions ...lientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ a.media-icons img{
padding: 0;
}



button.admin-cog{
margin-left:40px;
color:$ombi-active;
Expand Down
10 changes: 9 additions & 1 deletion .../ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Component, Input, Output, EventEmitter } from "@angular/core";
import { APP_BASE_HREF } from "@angular/common";
import { Component, Input, Output, EventEmitter, Inject } from "@angular/core";
import { RequestType } from "../../../../interfaces";
@Component({
selector: "social-icons",
Expand Down Expand Up @@ -31,6 +32,13 @@ export class SocialIconsComponent {
@Output() onReProcess4KRequest: EventEmitter<any> = new EventEmitter();

public RequestType = RequestType;
public baseUrl: string = "";

constructor (@Inject(APP_BASE_HREF) public href: string) {
if (this.href.length > 1) {
this.baseUrl = this.href;
}
}


public openDialog() {
Expand Down
2 changes: 1 addition & 1 deletion src/Ombi/ClientApp/src/app/wizard/plex/plex.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <H1 class="wizard-title">Plex Configuration</H1>
<div class="plex-buttons">
<div class="form-group">
<div style="text-align: center; margin-top: 20px">
<button (click)="requestAuthToken()" mat-raised-button color="primary" class="viewon-btn standard" [disabled]="completed">Request Token <i class="fas fa-key"></i></button>
<button (click)="requestAuthToken()" mat-raised-button color="primary" class="viewon-btn standard" [disabled]="completed">Request Token <i class="fa-solid fa-key"></i></button>
</div>
</div>
<p class="text-center space-or">OR</p>
Expand Down
6 changes: 3 additions & 3 deletions src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ <h1>Welcome to Ombi!</h1>
<br />
<div class="social-media">
<ul class="fa-ul">
<li><a href="https://discord.gg/Sa7wNWb" target="_blank"><span class="fa-li"><i class="fab fa-discord"></i></span>Ombi Discord</a>
<li><a href="https://github.com/Ombi-app/Ombi" target="_blank"><span class="fa-li"><i class="fab fa-github"></i></span>Ombi Github</a>
<li><a href="https://docs.ombi.app/" target="_blank"><span class="fa-li"><i class="fas fa-book"></i></span>Ombi Documentation</a>
<li><a href="https://discord.gg/Sa7wNWb" target="_blank"><span class="fa-li"><i class="fa-brands fa-discord"></i></span>Ombi Discord</a>
<li><a href="https://github.com/Ombi-app/Ombi" target="_blank"><span class="fa-li"><i class="fa-brands fa-github"></i></span>Ombi Github</a>
<li><a href="https://docs.ombi.app/" target="_blank"><span class="fa-li"><i class="fa-solid fa-book"></i></span>Ombi Documentation</a>
</ul>
</div>
</div>
Expand Down