From 09f365c039f4ccb52470750db129583fd43313e8 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 27 Mar 2019 21:46:17 +0000 Subject: [PATCH] !wip --- src/Ombi/ClientApp/src/app/app.component.html | 2 +- src/Ombi/ClientApp/src/app/app.component.ts | 2 ++ .../card/discover-card.component.scss | 2 -- .../ClientApp/src/app/interfaces/ICommon.ts | 1 + .../cast-carousel.component.html | 2 +- .../cast-carousel.component.scss | 7 +++++++ .../cast-carousel/cast-carousel.component.ts | 1 + .../social-icons/social-icons.component.html | 20 +++++++++---------- .../social-icons/social-icons.component.scss | 8 ++++++++ .../social-icons/social-icons.component.ts | 1 + .../media-details.component.scss | 8 -------- .../src/app/my-nav/my-nav.component.html | 5 +++-- .../src/app/my-nav/my-nav.component.ts | 9 +++++---- .../src/styles/primeng-overrides.scss | 2 +- 14 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.scss create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss diff --git a/src/Ombi/ClientApp/src/app/app.component.html b/src/Ombi/ClientApp/src/app/app.component.html index c547721fa..6e9a8b2d5 100644 --- a/src/Ombi/ClientApp/src/app/app.component.html +++ b/src/Ombi/ClientApp/src/app/app.component.html @@ -168,7 +168,7 @@
- diff --git a/src/Ombi/ClientApp/src/app/app.component.ts b/src/Ombi/ClientApp/src/app/app.component.ts index 55d8d81bb..7f5fde744 100644 --- a/src/Ombi/ClientApp/src/app/app.component.ts +++ b/src/Ombi/ClientApp/src/app/app.component.ts @@ -27,6 +27,7 @@ export class AppComponent implements OnInit { public userAccessToken: string; public voteEnabled = false; public applicationName: string = "Ombi" + public isAdmin: boolean; private checkedForUpdate: boolean; @@ -61,6 +62,7 @@ export class AppComponent implements OnInit { const theme = localStorage.getItem("theme"); this.onSetTheme(theme); this.user = this.authService.claims(); + this.isAdmin = this.authService.hasRole("admin"); this.settingsService.getCustomization().subscribe(x => { this.customizationSettings = x; diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.scss b/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.scss index d0ca84cb8..51ad20b66 100644 --- a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.scss @@ -6,9 +6,7 @@ $card-background: #2b2b2b; } .dark-card { - background-color: $card-background; border-radius: 8px; - color: white; height: 435px; } diff --git a/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts b/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts index a117565fd..06f33eb69 100644 --- a/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts +++ b/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts @@ -31,4 +31,5 @@ export interface INavBar { icon: string; name: string; link: string; + requiresAdmin: boolean; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html index bf94c89a4..5a6982efd 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html @@ -3,7 +3,7 @@ -
+
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.scss b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.scss new file mode 100644 index 000000000..d9db92e00 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.scss @@ -0,0 +1,7 @@ +@import "~@angular/material/theming"; +@import "~styles/variables.scss"; +.actor-background { + .dark & { + background: $backgroundTint-dark; + } +} diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts index 203841250..d7baa81f0 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts @@ -3,6 +3,7 @@ import { Component, Input } from "@angular/core"; @Component({ selector: "cast-carousel", templateUrl: "./cast-carousel.component.html", + styleUrls: ["./cast-carousel.component.scss"] }) export class CastCarouselComponent { diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html index ef5e29537..4dbbf416e 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html @@ -1,43 +1,43 @@ - + - + - + + matTooltip="Trailer" class="fa fa-youtube-play fa-2x grow-social"> - + - + - + - + + class="fa fa-play-circle fa-2x grow-social"> + class="fa fa-play-circle fa-2x grow-social"> \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss new file mode 100644 index 000000000..1925e4e98 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss @@ -0,0 +1,8 @@ + +.grow-social { + transition: all .2s ease-in-out; +} +.grow-social:hover { + transform: scale(1.1); + color: black; +} diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts index 25897b9a1..7b1e69ee3 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts @@ -3,6 +3,7 @@ import { Component, Inject, Input, Output, EventEmitter } from "@angular/core"; @Component({ selector: "social-icons", templateUrl: "./social-icons.component.html", + styleUrls: ["./social-icons.component.scss"] }) export class SocialIconsComponent { diff --git a/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss b/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss index 918deaa07..11a039a62 100644 --- a/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss +++ b/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss @@ -174,14 +174,6 @@ width: 173px; } -.grow { - transition: all .2s ease-in-out; -} -.grow:hover { - transform: scale(1.1); - color: black; -} - .media-icons { color: mat-color($ombi-app-primary) !important; padding: 1%; 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 56b363725..8de40bfcc 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 @@ -3,11 +3,12 @@ [mode]="(isHandset$ | async) ? 'over' : 'side'" [opened]="!(isHandset$ | async)"> {{applicationName}} - + {{nav.icon}} {{nav.name | translate}} - + exit_to_app diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts index 4e6a12b66..a52f99969 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts @@ -19,6 +19,7 @@ export class MyNavComponent implements OnInit { @Input() public showNav: boolean; @Input() public applicationName: string; @Input() public username: string; + @Input() public isAdmin: string; @Output() public logoutClick = new EventEmitter(); @Output() public themeChange = new EventEmitter(); public theme: string; @@ -31,10 +32,10 @@ export class MyNavComponent implements OnInit { } public navItems: INavBar[] = [ - { name: "NavigationBar.Discover", icon: "find_replace", link: "/discover" }, - { name: "NavigationBar.Requests", icon: "list", link: "/requests-list" }, - { name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement" }, - { name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About" }, + { name: "NavigationBar.Discover", icon: "find_replace", link: "/discover", requiresAdmin: false }, + { name: "NavigationBar.Requests", icon: "list", link: "/requests-list", requiresAdmin: false }, + { name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement", requiresAdmin: true }, + { name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About", requiresAdmin: true }, ] public logOut() { diff --git a/src/Ombi/ClientApp/src/styles/primeng-overrides.scss b/src/Ombi/ClientApp/src/styles/primeng-overrides.scss index 101626719..4ccb0765e 100644 --- a/src/Ombi/ClientApp/src/styles/primeng-overrides.scss +++ b/src/Ombi/ClientApp/src/styles/primeng-overrides.scss @@ -9,7 +9,7 @@ .ui-carousel-viewport { border:0 !important; - background-color:$background !important; + background-color:transparent !important; } .ui-carousel .ui-carousel-header {