diff --git a/src/Ombi.Store/Entities/Requests/MovieRequests.cs b/src/Ombi.Store/Entities/Requests/MovieRequests.cs index 93853fbfd..42b17be73 100644 --- a/src/Ombi.Store/Entities/Requests/MovieRequests.cs +++ b/src/Ombi.Store/Entities/Requests/MovieRequests.cs @@ -43,6 +43,11 @@ namespace Ombi.Store.Entities.Requests return "Common.Available"; } + if (Denied ?? false) + { + return "Common.Denied"; + } + if (Approved & !Available) { return "Common.ProcessingRequest"; diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 0f2e75b9a..45ff37c51 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -35,6 +35,7 @@ "angular-bootstrap-md": "^7.5.4", "angular-router-loader": "^0.8.5", "angular2-template-loader": "^0.6.2", + "angularx-qrcode": "^1.7.0-beta.5", "aspnet-prerendering": "^3.0.1", "awesome-typescript-loader": "^5.2.0", "bootstrap": "^4.2.1", diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html index e4816df02..53f96262a 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html @@ -1,7 +1,7 @@
- {{result.title}} + {{result.title}} diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss index 51ad20b66..8f25465df 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss @@ -21,14 +21,22 @@ $card-background: #2b2b2b; } $border-width: 3px; -.movie-image { - border-bottom: $border-width orange solid; -} -.tv-image { +.available { border-bottom: $border-width #1DE9B6 solid; } +.approved { + border-bottom: $border-width #ff5722 solid; +} + +.requested { + border-bottom: $border-width #ffd740 solid; +} +.notrequested { + border-bottom: $border-width #303030 solid; +} + .expand { text-align: center; } diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts index ba7234177..a83f2af26 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts @@ -27,23 +27,33 @@ export class DiscoverCardComponent implements OnInit { this.getExtraMovieInfo(); } } - - public openDetails(details: IDiscoverCardResult) { - const ref = this.dialog.open(DiscoverCardDetailsComponent, { width:"700px", data: details, panelClass: 'modal-panel' }) - ref.afterClosed().subscribe(result => { - console.log('The dialog was closed'); - }); + public openDetails(details: IDiscoverCardResult) { + this.dialog.open(DiscoverCardDetailsComponent, { width: "700px", data: details, panelClass: 'modal-panel' }) } public async getExtraTvInfo() { var result = await this.searchService.getTvInfo(this.result.id); this.setTvDefaults(result); this.updateTvItem(result); - + } + + public getStatusClass(): string { + if (this.result.available) { + return "available"; + } + if (this.result.approved) { + return "approved"; + } + if (this.result.requested) { + return "requested"; + } + return "notrequested"; + } + private getExtraMovieInfo() { - if(!this.result.imdbid) { + if (!this.result.imdbid) { this.searchService.getFullMovieDetails(this.result.id) .subscribe(m => { this.updateMovieItem(m); @@ -52,7 +62,7 @@ export class DiscoverCardComponent implements OnInit { } private updateMovieItem(updated: ISearchMovieResultV2) { - this.result.url = "http://www.imdb.com/title/" + updated.imdbId + "/"; + this.result.url = "http://www.imdb.com/title/" + updated.imdbId + "/"; this.result.available = updated.available; this.result.requested = updated.requested; this.result.requested = updated.requestProcessing; diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html index 8abda7e21..4da9c4b49 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html @@ -46,7 +46,7 @@ -
- - + +
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html index 52eb57759..ebf73901a 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html @@ -1,41 +1,49 @@ - + {{applicationName}} - - {{nav.icon}} -  {{nav.name | translate}} - - - + + {{nav.icon}} +  {{nav.name | translate}} + + + exit_to_app {{ 'NavigationBar.Logout' | translate }} - - - {{ 'NavigationBar.ChangeTheme' | translate }} - - - - -
- - - - -
+
+ + + + + + +
+
+
+ + brightness_7 + brightness_4 + +
+
diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html index a28deb192..12bf0002c 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html @@ -2,8 +2,9 @@ placeholder="{{'NavigationBar.Search' | translate}}" aria-label="Search" [ngbTypeahead]="searchModel" [resultFormatter]="formatter" [inputFormatter]="formatter" [resultTemplate]="template" (selectItem)="selected($event)"> - + +
  {{result.title}} @@ -26,6 +27,4 @@
- - \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html index 39f106f4a..9971775eb 100644 --- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html +++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html @@ -1,17 +1,26 @@

+
-
- - - - - {{lang.display}} - - - - +
+
+
+ + + + + {{lang.display}} + + + +
+
+ +
+
+
+ +
-
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts index 75bfb5c9b..9d6bd9b9b 100644 --- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts +++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts @@ -28,7 +28,6 @@ export class UserPreferenceComponent implements OnInit { if (user.name) { this.username = user.name; } -debugger; const customization = await this.settingsService.getCustomization().toPromise(); const accessToken = await this.identityService.getAccessToken().toPromise(); diff --git a/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts b/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts index dc0e4225e..4a3adb104 100644 --- a/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts +++ b/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts @@ -1,6 +1,8 @@ import { NgModule } from "@angular/core"; import { RouterModule } from "@angular/router" -/*import { QRCodeModule } from 'angularx-qrcode';*/ +import { QRCodeModule } from 'angularx-qrcode'; + +import { MatCheckboxModule } from '@angular/material'; import { SharedModule } from "../shared/shared.module"; @@ -11,7 +13,8 @@ import * as fromComponents from './components'; imports: [ RouterModule.forChild(fromComponents.routes), SharedModule, - /* QRCodeModule,*/ + QRCodeModule, + MatCheckboxModule, ], declarations: [ ...fromComponents.components @@ -20,7 +23,7 @@ import * as fromComponents from './components'; RouterModule, ], providers: [ - ], + ], }) export class UserPreferencesModule { } diff --git a/src/Ombi/ClientApp/src/index.html b/src/Ombi/ClientApp/src/index.html index 63bfc0c9e..caed4136d 100644 --- a/src/Ombi/ClientApp/src/index.html +++ b/src/Ombi/ClientApp/src/index.html @@ -11,8 +11,7 @@ function configExists(url) { return req.status==200; } - debugger; - var probePath = 'main.js'; + var probePath = 'styles/please-wait.js'; var origin = document.location.origin; var pathSegments = document.location.pathname.split('/'); diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json index df6f0f8dc..66dc0ba9d 100644 --- a/src/Ombi/wwwroot/translations/en.json +++ b/src/Ombi/wwwroot/translations/en.json @@ -239,6 +239,7 @@ }, "UserPreferences": { "Welcome":"Welcome {{username}}!", - "OmbiLanguage":"Ombi Language" + "OmbiLanguage":"Language", + "DarkMode":"Dark Mode" } }