diff --git a/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.scss b/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.scss index 195b7ff32..21fc73470 100644 --- a/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.scss +++ b/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.scss @@ -1,5 +1,87 @@ +@import "~styles/variables.scss"; .small-middle-container{ margin: auto; - width: 80%; + width: 85%; } + +//Kinda restyled the entire calendar +::ng-deep .dark .fc th { + background-color:#545454 !important; + color: #FFF; + border: 1px solid #303030; +} + +::ng-deep .dark .fc td.ui-widget-content{ + background-color:#424242 !important; + color: #FFF; + border: 1px solid #303030; +} + +::ng-deep .dark .fc td.fc-head-container { + border: 1px solid #303030; +} + +::ng-deep .dark fc-day-grid-event fc-h-event fc-event fc-start fc-end{ + background:$accent-dark !important; +} + +::ng-deep .ui-button { + margin-top:10px !important; + text-transform: uppercase; + text-decoration: none; + padding: 8px; + border: 1px solid rgb(221, 221, 221) !important; + display: inline-block; + transition: all 0.4s ease 0s; + background-color: $accent !important; + } + +::ng-deep .dark .ui-button { + background-color: $accent-dark !important; + border: 1px solid #494949 !important; + color: #494949 !important; +} + +::ng-deep .dark .ui-button:enabled:hover { + color: #303030 !important; + background: $accent-dark !important; + border-color: $accent-dark !important; + transition: all 0.4s ease 0s; + } + +::ng-deep .input-group-addon{ + margin-left:10px; +} + +::ng-deep .fc .fc-event{ + background: $accent !important; + color:#FFF !important; + font-size:0.9em; + font-weight:400; + border: 0px solid !important; +} + +::ng-deep .dark .fc .fc-event{ + background:$accent-dark !important; + color:#303030 !important; + font-size:0.9em; + font-weight:400; +} + +::ng-deep .fc-header-toolbar{ + display:block; +} + +::ng-deep .fc-left{ + float:left; +} + +::ng-deep .fc-right{ + float:right; +} + +::ng-deep .fc-center{ + margin-left:44%; + padding-top: 10px; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.ts b/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.ts index 0a183651a..64f5c7db1 100644 --- a/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.ts +++ b/src/Ombi/ClientApp/src/app/calendar/components/calendar.component.ts @@ -17,7 +17,6 @@ export class CalendarComponent implements OnInit { constructor(private calendarService: CalendarService) { } public async ngOnInit() { - debugger; this.loading() this.entries = await this.calendarService.getCalendarEntries(); @@ -26,10 +25,9 @@ export class CalendarComponent implements OnInit { header: { left: 'prev,next', center: 'title', - right: 'month,agendaWeek' + right: 'agendaWeek,month' }, eventClick: (e: any) => { - debugger; e.preventDefault(); } }; diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.scss b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.scss index 2e6ec8c7d..8d2e06a92 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.scss @@ -16,6 +16,7 @@ .details strong { font-weight: bold; } + .grow { transition: all .2s ease-in-out; } @@ -47,4 +48,4 @@ h3 strong { .overview { height:300px; overflow-y: scroll; -} \ No newline at end of file +} 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 3bd9d301f..f55b989f2 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 @@ -2,14 +2,17 @@ $ombi-primary:#3f3f3f; $card-background: #2b2b2b; #cardImage { border-radius: 5px 5px 0px 0px; + height:75%; } .dark-card { border-radius: 8px; } +// Changed height to 100% to make all cards the same height .card-spacing { margin-top: 10%; + height:100%; } @@ -39,8 +42,10 @@ $border-width: 3px; text-align: center; } +// Changed height to 100% to make all cards the same height .grow { transition: all .2s ease-in-out; + height:100%; } .grow:hover { @@ -52,3 +57,25 @@ $border-width: 3px; // color: white; border-radius: 2% } + + +/* Title adjust for the Discover page */ +.mat-card-content h6 { + overflow:hidden; + white-space:nowrap; + font-weight:400; + font-size:1.1rem; +} + +/* Summary adjust for Discover page */ +.small, small { + font-size:0.8rem; +} + +@media (min-width: 2000px) { + #cardImage { + height:80%; + object-fit:cover; + display:block; + } +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss index 1e50c5e1f..1fffc3bbc 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss @@ -4,7 +4,7 @@ .small-middle-container { margin: auto; - width: 80%; + width: 85%; } .small-padding { @@ -24,4 +24,153 @@ .small-space { padding-top: 1%; +} + +::ng-deep .mat-card-image { + height:75%; + object-fit:cover; + display:block; +} + +.card-spacing { + height:100%; +} + +.mat-card-content h6 { + overflow:hidden; + white-space:nowrap; + font-weight:500; + font-size:1.1rem; +} + +@media (min-width: 300px) { + .col-xl-2 { + flex: 0 0 100%; + max-width: 100%; + min-width: 100%; + } + .small-middle-container{ + width:100%; + } + + .btn-group { + width:100%; + } + + mat-button-base { + width:100%; + } + + .col{ + padding-right: 10px !important; + padding-left:10px !important; + } + + .row{ + margin-left:0px; + } + + .small-padding{ + padding-left: 5px !important; + padding-right: 0px !important; + height: 40em; + } + + ::ng-deep .mat-card-image { + height:85% !important; + } +} + +@media (min-width: 600px) { + .justify-content-md-center { + justify-content: center !important; + } + .small-middle-container{ + width:auto; + } + + .btn-group { + width:auto; + } + + mat-button-base { + width:auto; + } + + ::ng-deep .mat-card-image { + height:75% !important; + } +} + +@media (min-width: 700px) { + .col-xl-2 { + flex: 0 0 50%; + max-width: 50%; + min-width: 50%; + } + + .col{ + padding-right: 15px !important; + padding-left: 15px !important; + } + + .small-padding{ + padding-left: 20px !important; + padding-right: 20px !important; + height:auto; + } + + .row{ + margin-left:0px; + } + + .small-middle-container{ + width:auto; + } + + .btn-group { + width:auto; + } + + mat-button-base { + width:auto; + } +} + +@media (min-width: 1000px) { + .col-xl-2 { + flex: 0 0 33.33333%; + max-width: 33.33333%; + min-width: 33.33333%; + } +} + +@media (min-width: 1300px) { + .col-xl-2 { + flex: 0 0 20%; + max-width: 25%; + min-width: 25%; + } +} + +@media (min-width: 1600px) { + .col-xl-2 { + flex: 0 0 20%; + max-width: 20%; + min-width: 20%; + } +} +@media (min-width: 1900px) { + .col-xl-2 { + flex: 0 0 16.66666667%; + max-width: 16.66666667%; + min-width: 16.66666667%; + } +} +@media (min-width: 2200px) { + .col-xl-2 { + flex: 0 0 14.285713%; + max-width: 14.285713%; + min-width: 14.285713%; + } } \ 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 e4bf0cfe8..81ae7d6f9 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 @@ -9,10 +9,12 @@  {{nav.name | translate}} - - exit_to_app - {{ 'NavigationBar.Logout' | translate }} - + + exit_to_app + {{ 'NavigationBar.Logout' | translate }} + @@ -32,16 +34,16 @@ - -
-
- - brightness_7 - brightness_4 - -
-
- + +
+
+ + wb_incandescent + brightness_4 + +
+
+ diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss index af226e40a..b26c43c30 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss @@ -4,7 +4,7 @@ } .sidenav { - width: 200px; + width: 220px; } .sidenav .mat-toolbar { @@ -47,12 +47,26 @@ color:white; } -.active-list-item-dark { +::ng-deep .dark .active-list-item { background: $accent-dark !important; - color:black; + color:black !important; + font-weight:500; } +// Changed color with !important and changed the font weight +/*.active-list-item-dark { + background: $accent-dark !important; + color:black !important; + font-weight:500; +}*/ + +// changed bottom to 10px so when you overlay a link it won't get blocked by URL .bottom-nav-link { - bottom: 0; + bottom: 10px; position: absolute; -} \ No newline at end of file + //background-color:#E84C3D; +} + +/*bottom-nav-link:hover{ + background-color:rgb(226, 52, 36) !important; +}*/ \ No newline at end of file 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 908966363..e91453578 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 @@ -63,8 +63,9 @@ export class MyNavComponent implements OnInit { } } + // @TIDUSJAR Don't know if we need this method anymore? public getTheme(){ - return this.theme === 'dark' ? 'active-list-item-dark' : 'active-list-item'; + return 'active-list-item'; } } diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.scss b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.scss new file mode 100644 index 000000000..19e0ace0f --- /dev/null +++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.scss @@ -0,0 +1,31 @@ +@import "~styles/variables.scss"; + +.dark .mat-header-cell { + background: $accent-dark !important; + font-size: 1em; + font-weight: bold; + color: #303030; +} + +.mat-form-field { + float:right; +} + +::ng-deep .dark .mat-form-field-label{ + font-size: 1.2em; +} + +::ng-deep .mat-form-field-infix { + width: 10em; + margin-top:1em; +} + +::ng-deep .dark .mat-tab-label-active{ + background: $accent-dark !important; + color: #303030 !important; + font-weight:bold; +} + +::ng-deep .mat-tab-label{ + opacity: 1; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts index 7659b5161..6c451d3ba 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts +++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts @@ -12,7 +12,7 @@ import { RequestFilterType } from "../../models/RequestFilterType"; @Component({ templateUrl: "./movies-grid.component.html", selector: "movies-grid", - styleUrls: ["../requests-list.component.scss"] + styleUrls: ["./movies-grid.component.scss"] }) export class MoviesGridComponent implements OnInit, AfterViewInit { public dataSource: IMovieRequests[] = []; diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html index a5b9364fe..623987a1c 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html +++ b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html @@ -1,19 +1,21 @@
+
- + - +

Coming soon

...

+
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss index c875fa54c..82ebe4a98 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss +++ b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss @@ -1,4 +1,53 @@ +@import "~styles/variables.scss"; + .small-middle-container{ margin: auto; - width: 95%; + width: 85%; + margin-top:10px; } + +::ng-deep .dark .mat-header-cell { + background: rgba(0, 0, 0, 0.381)!important; + font-size: 1em; + font-weight: 500; + color: rgba(255, 255, 255, 0.842) !important; +} + +::ng-deep .dark .mat-header-cell .mat-checkbox-frame { + border-color: #FFF; +} + +.mat-form-field { + float:right; +} + +::ng-deep .mat-form-field-label{ + font-size: 1.2em; +} + +::ng-deep .mat-form-field-infix { + width: 10em; + margin-top:1em; +} + +::ng-deep .dark .mat-tab-label-active{ + background: $accent-dark !important; + color: #303030 !important; + font-weight:bold; +} + +::ng-deep .mat-tab-label{ + opacity: 1; +} + +::ng-deep .mat-tab-header { + margin-top: 2em; +} + +::ng-deep .dark .mat-sort-header-arrow{ + color:#303030; +} + +::ng-deep .mat-column-actions{ + text-align:end; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/about/about.component.html b/src/Ombi/ClientApp/src/app/settings/about/about.component.html index 642c6b254..8775187be 100644 --- a/src/Ombi/ClientApp/src/app/settings/about/about.component.html +++ b/src/Ombi/ClientApp/src/app/settings/about/about.component.html @@ -1,5 +1,5 @@  -
+
About
diff --git a/src/Ombi/ClientApp/src/app/settings/about/about.component.scss b/src/Ombi/ClientApp/src/app/settings/about/about.component.scss index c99e10bc3..5afb20333 100644 --- a/src/Ombi/ClientApp/src/app/settings/about/about.component.scss +++ b/src/Ombi/ClientApp/src/app/settings/about/about.component.scss @@ -17,4 +17,10 @@ flex: 1; overflow: hidden; word-wrap: break-word; + } + + .small-middle-container{ + margin: auto; + width: 85%; + margin-top:10px; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html index a270d513c..6ab91801c 100644 --- a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html +++ b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html @@ -1,5 +1,5 @@  - +
Authentication @@ -64,4 +64,5 @@
- \ No newline at end of file + +
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.scss b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.scss new file mode 100644 index 000000000..09f9b5217 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.scss @@ -0,0 +1,20 @@ +@import "~styles/variables.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +.control-label{ + font-weight:400; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} diff --git a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts index 50152409c..6f140f8af 100644 --- a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts @@ -6,6 +6,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./authentication.component.html", + styleUrls: ["./authentication.component.scss"], }) export class AuthenticationComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.html b/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.html index ae8f7bb6f..88db832e2 100644 --- a/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.html +++ b/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.html @@ -1,18 +1,29 @@  +
CouchPotato Settings
-
-
-
- - +
+
+
+
+ + +
- - +
+
+
+ + +
+
+
+
+
@@ -37,13 +48,6 @@ The API Key is required
-
-
- - - -
-
@@ -97,4 +101,5 @@
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.scss b/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.scss new file mode 100644 index 000000000..af8994a07 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.scss @@ -0,0 +1,32 @@ +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} + +.col-md-6{ + display: contents; +} +.col-md-4{ + display: contents; +} + +@media (min-width:1440px) { + .col-md-6{ + display: inline-table; + } + + .col-md-4{ + display: inline-table; + } +} diff --git a/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.ts b/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.ts index f4b209189..112e66b5c 100644 --- a/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/couchpotato/couchpotato.component.ts @@ -7,6 +7,7 @@ import { ICouchPotatoProfiles } from "../../interfaces"; @Component({ templateUrl: "./couchpotato.component.html", + styleUrls: ["./couchpotato.component.scss"] }) export class CouchPotatoComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html index da0911427..2d6198a6a 100644 --- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html +++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html @@ -1,7 +1,7 @@  - +
-
+
Customization
@@ -14,7 +14,7 @@ - +
@@ -42,12 +42,13 @@ -
- -
+ +
+ +
@@ -57,4 +58,5 @@ -
\ No newline at end of file +
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.scss b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.scss new file mode 100644 index 000000000..3fc3c097e --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.scss @@ -0,0 +1,42 @@ +@import "~styles/shared.scss"; +.col-12 { + display:grid; +} + +textarea { + min-height:100px; + height: auto; + max-height:800px; +} + +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.control-label{ + font-weight:400; +} + +.row{ + display:block; +} + +.btn-danger-outline{ + background-color: #E84C3D; +} + +.btn-success-outline{ + background-color: #1b9d1b; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.ts b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.ts index 0daf9ffad..4e2b22129 100644 --- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.ts @@ -6,6 +6,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./customization.component.html", + styleUrls: ["./customization.component.scss"], }) export class CustomizationComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html index 827f1ac2d..d672a1d6b 100644 --- a/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html +++ b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html @@ -1,11 +1,11 @@  - +
DogNzb Settings -
+
@@ -51,4 +51,5 @@
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.scss b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.scss new file mode 100644 index 000000000..345e1a9ab --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.scss @@ -0,0 +1,16 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.ts b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.ts index aff18f64e..16683a0e3 100644 --- a/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.ts @@ -5,6 +5,7 @@ import { NotificationService, SettingsService } from "../../services"; @Component({ templateUrl: "./dognzb.component.html", + styleUrls: ["./dognzb.component.scss"] }) export class DogNzbComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/emby/emby.component copy.html b/src/Ombi/ClientApp/src/app/settings/emby/emby.component copy.html new file mode 100644 index 000000000..7b19429be --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/emby/emby.component copy.html @@ -0,0 +1,110 @@ + + +
+
+
+ + Emby/Jellyfin Configuration + + +
+
+
+ + +
+
+
+ +
+
+ + +
+ + +
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + +
+
+ +
+ +
+ +
+
+ +
+ +
+ + Current URL: "{{server.serverHostname}}/#!/{{settings.isJellyfin ? ("itemdetails"): ("item/item")}}.html?id=1" + Current URL: "https://app.emby.media/#!/{{settings.isJellyfin ? ("itemdetails"): ("item/item")}}.html?id=1 +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
diff --git a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html index 2fbe36c02..fe45ee301 100644 --- a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html +++ b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html @@ -1,7 +1,7 @@  - -
+
+
Emby/Jellyfin Configuration @@ -15,23 +15,16 @@
- -
- -
- -
- - - -
-
-
+ + +
+ +


-
+
@@ -81,23 +74,19 @@
-
- -
-
- - -
- - -
+ + + + + +
-
+
@@ -106,3 +95,4 @@
+
diff --git a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.scss b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.scss index b0859947c..a019432da 100644 --- a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.scss +++ b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.scss @@ -1,3 +1,45 @@ -.full { - width: 100%; +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.col-md-10{ + display: grid; +} + +.col-md-2{ + display: contents; +} +.control-label{ + font-weight:400; +} + +.row{ + display:block; +} + +.btn-danger-outline{ + background-color: #E84C3D; +} + +.btn-success-outline{ + background-color: #1b9d1b; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} + +@media (min-width:1440px) { + .col-md-2{ + display: inline-table; + } } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.ts b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.ts index 816718f61..858f3846c 100644 --- a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.ts @@ -2,6 +2,8 @@ import { IEmbyServer, IEmbySettings } from "../../interfaces"; import { EmbyService, JobService, NotificationService, SettingsService, TesterService } from "../../services"; +import { MatTabChangeEvent, MatTabGroup } from "@angular/material"; +import {FormControl} from '@angular/forms'; @Component({ templateUrl: "./emby.component.html", @@ -11,6 +13,7 @@ export class EmbyComponent implements OnInit { public settings: IEmbySettings; public hasDiscovered: boolean; + selected = new FormControl(0); constructor(private settingsService: SettingsService, private notificationService: NotificationService, @@ -29,21 +32,25 @@ export class EmbyComponent implements OnInit { this.hasDiscovered = true; } - public addTab() { - if (this.settings.servers == null) { - this.settings.servers = []; + public addTab(event: MatTabChangeEvent) { + const tabName = event.tab.textLabel; + if (tabName == "Add Server"){ + if (this.settings.servers == null) { + this.settings.servers = []; + } + this.settings.servers.push({ + name: "New " + this.settings.servers.length + "*", + id: Math.floor(Math.random() * (99999 - 0 + 1) + 1), + apiKey: "", + administratorId: "", + enableEpisodeSearching: false, + ip: "", + port: 0, + ssl: false, + subDir: "", + } as IEmbyServer); + this.selected.setValue(this.settings.servers.length - 1); } - this.settings.servers.push({ - name: " ", - id: Math.floor(Math.random() * (99999 - 0 + 1) + 1), - apiKey: "", - administratorId: "", - enableEpisodeSearching: false, - ip: "", - port: 8097, - ssl: false, - subDir: "", - } as IEmbyServer); } public test(server: IEmbyServer) { @@ -60,6 +67,7 @@ export class EmbyComponent implements OnInit { const index = this.settings.servers.indexOf(server, 0); if (index > -1) { this.settings.servers.splice(index, 1); + this.selected.setValue(this.settings.servers.length - 1); } } diff --git a/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.html b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.html new file mode 100644 index 000000000..37434ac04 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.html @@ -0,0 +1,27 @@ + + + +
+ + + + + + + + + + + + + + + + + + + +
TitleTypeRetry CountError DescriptionDelete
+ {{v.title}} + {{RequestType[v.type] | humanize}}{{v.retryCount}}
+
diff --git a/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.scss b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.scss new file mode 100644 index 000000000..018bebef8 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.scss @@ -0,0 +1,5 @@ +.small-middle-container{ + margin: auto; + width: 85%; + margin-top:10px; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.ts b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.ts index a303ac713..feae7cfaf 100644 --- a/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.ts @@ -3,7 +3,8 @@ import { IFailedRequestsViewModel, RequestType } from "../../interfaces"; import { RequestRetryService } from "../../services"; @Component({ - templateUrl: "./failedrequest.component.html", + templateUrl: "./failedrequests.component.html", + styleUrls: ["./failedrequests.component.scss"], }) export class FailedRequestsComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html index fa5988a79..84a27b509 100644 --- a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html +++ b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html @@ -1,9 +1,10 @@  +
Issues -
+
@@ -61,7 +62,8 @@
-
+
+ Categories:
{{cat.value}} @@ -73,4 +75,5 @@
-
\ No newline at end of file + +
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.scss b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.scss new file mode 100644 index 000000000..abd043d0f --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.scss @@ -0,0 +1,52 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.control-label{ + font-weight:400; +} + +.col-md-6{ + display: contents; +} +.col-md-9{ + display: inline-table; +} +.col-md-3{ + display: inline-table; +} + +.row{ + display:block; +} + +.btn-danger-outline{ + background-color: #E84C3D; +} + +.btn-success-outline{ + background-color: #1b9d1b; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .categoryResults{ + background-color: rgba(0, 0, 0, 0.05); + padding: 1em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} +@media (min-width:1440px) { + .col-md-6{ + display: inline-table; + } +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.ts b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.ts index cfe0bd65c..cfb6ae94d 100644 --- a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.ts @@ -6,6 +6,7 @@ import { IssuesService, NotificationService, SettingsService } from "../../servi @Component({ templateUrl: "./issues.component.html", + styleUrls: ["./issues.component.scss"] }) export class IssuesComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.scss b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.scss new file mode 100644 index 000000000..018bebef8 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.scss @@ -0,0 +1,5 @@ +.small-middle-container{ + margin: auto; + width: 85%; + margin-top:10px; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts index 1a543f885..50243337a 100644 --- a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts @@ -5,6 +5,7 @@ import { NotificationService, SettingsService } from "../../services"; @Component({ templateUrl: "./jobs.component.html", + styleUrls: ["./jobs.component.scss"] }) export class JobsComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html index 26711c6e5..7b948dbe7 100644 --- a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html +++ b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html @@ -1,59 +1,59 @@ - - - + +
-
-
+
Landing Page Configuration - - + +
+ Enable - -
-
- - + + + +

Notice Message

+
+
+ +
-
-

Notice Message

-
-
- +

Notice Preview:

+
+
-
-

Notice Preview:

-
-
-
- - + - + -
-
- +
+
+ +
-
+
diff --git a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.scss b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.scss new file mode 100644 index 000000000..2b7480f99 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.scss @@ -0,0 +1,30 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +@media (min-width: 1200px){ + .container { + max-width: inherit; + } +} + +@media (min-width: 992px){ + .container { + max-width: inherit; + } +} + +@media (min-width: 768px){ + .container { + max-width: inherit; + } +} + +@media (min-width: 576px){ + .container { + max-width: inherit; + } +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.ts b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.ts index c79c66ff7..616013725 100644 --- a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.ts @@ -6,6 +6,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./landingpage.component.html", + styleUrls: ["./landingpage.component.scss"], }) export class LandingPageComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html index b8b353d22..c70e8a815 100644 --- a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html +++ b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html @@ -1,18 +1,17 @@  -
+
+
Lidarr Settings
- - Advanced +
+
Enable
+
Advanced
+
- -
-
- Enable -
- + +
@@ -44,7 +43,7 @@
-
+
@@ -117,3 +116,4 @@
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.scss b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.scss new file mode 100644 index 000000000..b6f3d1014 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.scss @@ -0,0 +1,50 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.col-md-6{ + display: contents; +} + +.col-md-5{ + display: contents; +} + +.control-label{ + font-weight:400; +} + +.row{ + display:block; +} + +.btn-danger-outline{ + background-color: #E84C3D; +} + +.btn-success-outline{ + background-color: #1b9d1b; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} + +@media (min-width:1440px) { + .col-md-6{ + display: inline-table; + } + + .col-md-5{ + display: inline-table; + } +} diff --git a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts index 45efdb792..c85b65c4d 100644 --- a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./lidarr.component.html", + styleUrls: ["./lidarr.component.scss"] }) export class LidarrComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss b/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss index 637848b40..18096ace2 100644 --- a/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss +++ b/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss @@ -1,8 +1,13 @@ .small-middle-container{ margin: auto; - width: 80%; + width: 85%; + margin-top:10px; } .code-block { - font-size: 10px; + font-size: 12px; +} + +::ng-deep .dark .code-block { + color:#FFF !important; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html index 5c51c68ca..a858b98d8 100644 --- a/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html +++ b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html @@ -1,5 +1,5 @@  - +
Mass Email @@ -47,4 +47,5 @@ -
\ No newline at end of file + +
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.scss b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.scss new file mode 100644 index 000000000..018bebef8 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.scss @@ -0,0 +1,5 @@ +.small-middle-container{ + margin: auto; + width: 85%; + margin-top:10px; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.ts b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.ts index 91693103f..17beb5405 100644 --- a/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.ts @@ -5,6 +5,7 @@ import { IdentityService, NotificationMessageService, NotificationService, Setti @Component({ templateUrl: "./massemail.component.html", + styleUrls: ["./massemail.component.scss"] }) export class MassEmailComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html index fd907f1b2..ed5c524d3 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html @@ -1,6 +1,6 @@  -
+
Discord Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts index bbd43e974..7c0222d96 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./discord.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class DiscordComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html index d73c76f06..b0f8153f8 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html @@ -1,6 +1,6 @@  -
+
Email Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts index f67828afb..f880891a5 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts @@ -9,6 +9,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./emailnotification.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class EmailNotificationComponent implements OnInit { public NotificationType = NotificationType; diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html index 9148cb880..0b732fd74 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html @@ -1,6 +1,6 @@  -
+
Gotify Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.ts index f6c08d41b..94345a391 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./gotify.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class GotifyComponent implements OnInit { public NotificationType = NotificationType; diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html index c1e308315..ea18e07e5 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html @@ -1,6 +1,6 @@  -
+
Mattermost Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.ts index 65a33a4f3..cb5a85ff1 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./mattermost.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class MattermostComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html index 2b7ea9b2c..e71a49497 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html @@ -1,6 +1,6 @@  -
+
Mobile Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.ts index 55d9b31e7..983b59ef2 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.ts @@ -8,6 +8,7 @@ import { MobileService, SettingsService } from "../../services"; @Component({ templateUrl: "./mobile.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class MobileComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html index c4d31ae8f..de484e726 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html @@ -1,7 +1,7 @@  -
+
Newsletter
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.ts index eae7176e2..cdefe9682 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.ts @@ -6,6 +6,7 @@ import { TesterService } from "../../services/applications/tester.service"; @Component({ templateUrl: "./newsletter.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class NewsletterComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss b/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss index fa0219742..33f8a2d6c 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss +++ b/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss @@ -1,4 +1,5 @@ -::ng-deep ngb-accordion > div.card { +@import "~styles/shared.scss"; +::ng-deep ngb-accordion > div.card { color:white; padding-top: 0px; } @@ -6,3 +7,9 @@ ::ng-deep ngb-accordion > div.card > div.card-header { padding:0px; } + +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html index d78096308..3c4db7698 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html @@ -1,6 +1,6 @@  -
+
Pushbullet Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.ts index d65a0e3b5..541fc3b52 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./pushbullet.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class PushbulletComponent implements OnInit { public NotificationType = NotificationType; diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html index 499263dec..8ce9b401d 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html @@ -1,6 +1,6 @@  -
+
Pushover Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.ts index 64f339192..825afc8ac 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./pushover.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class PushoverComponent implements OnInit { public NotificationType = NotificationType; diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html index c4e5418df..15ef796fc 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html @@ -1,6 +1,6 @@  -
+
Slack Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.ts index 7ea53d0fb..c32d44432 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./slack.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class SlackComponent implements OnInit { public NotificationType = NotificationType; diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html index c456281f8..d89d14483 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html @@ -1,6 +1,6 @@  -
+
Telegram Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.ts index 7d216901b..085a7ee75 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./telegram.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class TelegramComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html index ed6eb43b9..1ee583104 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html @@ -1,6 +1,6 @@  -
+
Webhook Notifications
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.ts index d410b2b44..2a7069b4c 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./webhook.component.html", + styleUrls: ["./notificationtemplate.component.scss"] }) export class WebhookComponent implements OnInit { public NotificationType = NotificationType; diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html index a3b34dd76..63a426dcb 100644 --- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html +++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html @@ -1,5 +1,5 @@  - +
Ombi Configuration @@ -71,4 +71,5 @@
-
\ No newline at end of file +
+
diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.scss b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.scss new file mode 100644 index 000000000..6fe6c3f0a --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.scss @@ -0,0 +1,21 @@ +.col-12 { + display:grid; +} + +textarea { + min-height:100px; + height: auto; + max-height:800px; +} + +.small-middle-container{ + margin: auto; + width: 85%; + margin-top:10px; +} + +@media (min-width: 1600px) { + .container { + max-width: 1500px; + } +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts index 6439cd787..09b066682 100644 --- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts @@ -9,6 +9,7 @@ import * as languageData from "../../../other/iso-lang.json"; @Component({ templateUrl: "./ombi.component.html", + styleUrls: ["./ombi.component.scss"], }) export class OmbiComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/plex/plex.component copy.html b/src/Ombi/ClientApp/src/app/settings/plex/plex.component copy.html new file mode 100644 index 000000000..e0c8f4cde --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/plex/plex.component copy.html @@ -0,0 +1,198 @@ + +
+
+
+ Advanced + +
+
+
+
+ Plex Configuration + +
+ +
+
+ + +
+
+
+ +
+
+ + + +
+ + +
+
+
+ +
+
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+ +
+ Note: if nothing is selected, we will monitor all libraries +
+
+ +
+
+
+
+
+
+ + +
+
+
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.html b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.html index 6310a9cf1..4fc63143b 100644 --- a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.html +++ b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.html @@ -1,6 +1,7 @@  +
-
+
Advanced
@@ -17,160 +18,151 @@
-
- -
- - - -
- - -
-
-
- + + +
+ +
+
+
+ +
+ +
+ +
+ +
-
-
-
- -
- -
- -
-
- -
- -
- -
+
+ +
+
+
-
- -
- -
+
+ +
+
+
-
-
- - -
+
+
+ +
+
-
- -
- -
+
+ +
+
+
-
- -
- -
+
+ +
+
+
-
-
- -
- -
-
-
- -
+
+
+ +
+ +
+
+
+
+
-
-
- -
+
+
+
+
+
+
+
+
-
-
- -
+ -
- -
- Note: if nothing is selected, we will monitor all libraries -
-
- -
+
+
+ +
+ Note: if nothing is selected, we will monitor all libraries +
+
+
-
-
-
-
- - -
+
+
+
+
+
+ +
+
-
- -
- -
+
+ +
+
+
-
-
- -
+
+
+
-
- - -
- +
+ + + + +
@@ -194,3 +186,4 @@
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss new file mode 100644 index 000000000..b6f3d1014 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss @@ -0,0 +1,50 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.col-md-6{ + display: contents; +} + +.col-md-5{ + display: contents; +} + +.control-label{ + font-weight:400; +} + +.row{ + display:block; +} + +.btn-danger-outline{ + background-color: #E84C3D; +} + +.btn-success-outline{ + background-color: #1b9d1b; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} + +@media (min-width:1440px) { + .col-md-6{ + display: inline-table; + } + + .col-md-5{ + display: inline-table; + } +} diff --git a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts index df09e8167..cacdd76c8 100644 --- a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.ts @@ -1,12 +1,15 @@ -import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core"; import { Subject } from "rxjs"; import { takeUntil } from "rxjs/operators"; import { IPlexLibrariesSettings, IPlexServer, IPlexServerResponse, IPlexServerViewModel, IPlexSettings } from "../../interfaces"; import { JobService, NotificationService, PlexService, SettingsService, TesterService } from "../../services"; +import { MatTabChangeEvent, MatTabGroup } from "@angular/material"; +import {FormControl} from '@angular/forms'; @Component({ templateUrl: "./plex.component.html", + styleUrls: ["./plex.component.scss"] }) export class PlexComponent implements OnInit, OnDestroy { public settings: IPlexSettings; @@ -14,6 +17,8 @@ export class PlexComponent implements OnInit, OnDestroy { public username: string; public password: string; public serversButton = false; + selected = new FormControl(0); + @ViewChild("tabGroup", {static: false}) public tagGroup: MatTabGroup; public advanced = false; @@ -67,18 +72,26 @@ export class PlexComponent implements OnInit, OnDestroy { }); } - public addTab() { - if (this.settings.servers == null) { + public addTab(event: MatTabChangeEvent) { + + const tabName = event.tab.textLabel; + if (tabName == "Add Server"){ + + if (this.settings.servers == null) { this.settings.servers = []; - } - this.settings.servers.push( { name: "New*", id: Math.floor(Math.random() * (99999 - 0 + 1) + 1) }); + } + this.settings.servers.push( { name: "New" + this.settings.servers.length + "*", id: Math.floor(Math.random() * (99999 - 0 + 1) + 1) }); + //this.tagGroup.selectedIndex = (0); + this.selected.setValue(this.settings.servers.length - 1); + } } public removeServer(server: IPlexServer) { const index = this.settings.servers.indexOf(server, 0); if (index > -1) { this.settings.servers.splice(index, 1); + this.selected.setValue(this.settings.servers.length - 1); } } diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html index b948b931f..9bc7c95b1 100644 --- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html +++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html @@ -1,21 +1,14 @@  -
+
Radarr Settings
- - Advanced - +
Enable
+
Advanced
-
-
-
- -
- Enable -
- - +
+ +
@@ -46,7 +39,7 @@
-
+
diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.scss b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.scss new file mode 100644 index 000000000..b35e0be95 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.scss @@ -0,0 +1,56 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.col-md-6{ + display: contents; +} + +.col-md-5{ + display: contents; +} + +.col-md-4{ + display: contents; +} + +.control-label{ + font-weight:400; +} + +.row{ + display:block; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} + +::ng-deep .load { + max-width: fit-content; + margin-left:3em; + padding: 0.5rem 1.14rem; +} + +@media (min-width:1440px) { + .col-md-6{ + display: inline-table; + } + + .col-md-5{ + display: inline-table; + } + + .col-md-4{ + display: inline-table; + } +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts index 4f300de85..505a188c6 100644 --- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts @@ -10,6 +10,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./radarr.component.html", + styleUrls: ["./radarr.component.scss"] }) export class RadarrComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html b/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html index a88a8eb53..e644889c5 100644 --- a/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html +++ b/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html @@ -60,6 +60,4 @@ - - -
\ No newline at end of file + \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.html b/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.html index 6307b6332..8e63f318c 100644 --- a/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.html +++ b/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.html @@ -1,6 +1,6 @@  -
+
SickRage Settings diff --git a/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.scss b/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.scss new file mode 100644 index 000000000..990deaa0b --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.scss @@ -0,0 +1,15 @@ +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.ts b/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.ts index 6baf916ca..75e45fe7f 100644 --- a/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/sickrage/sickrage.component.ts @@ -8,6 +8,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./sickrage.component.html", + styleUrls: ["./sickrage.component.scss"] }) export class SickRageComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html index f016fd56e..320b38363 100644 --- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html +++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html @@ -1,15 +1,15 @@  -
+
Sonarr Settings
Advanced
- + -
-
+
+
@@ -18,7 +18,7 @@
-
+
@@ -27,6 +27,16 @@
+
+
+
+ + +
+
+
+
+
-
-
- - - -
-
@@ -72,7 +75,7 @@
-
+
@@ -111,7 +114,7 @@ [ngClass]="{'form-error': form.get('rootPath').hasError('required')}"> -
@@ -156,20 +159,20 @@
- -
-
- -
+
+
+
+
+
+
-
+
+
-
diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.scss b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.scss new file mode 100644 index 000000000..b35e0be95 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.scss @@ -0,0 +1,56 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.col-md-6{ + display: contents; +} + +.col-md-5{ + display: contents; +} + +.col-md-4{ + display: contents; +} + +.control-label{ + font-weight:400; +} + +.row{ + display:block; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} + +::ng-deep .load { + max-width: fit-content; + margin-left:3em; + padding: 0.5rem 1.14rem; +} + +@media (min-width:1440px) { + .col-md-6{ + display: inline-table; + } + + .col-md-5{ + display: inline-table; + } + + .col-md-4{ + display: inline-table; + } +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts index 11845a06e..ec044d9e3 100644 --- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts @@ -11,6 +11,7 @@ import { SettingsService } from "../../services"; @Component({ templateUrl: "./sonarr.component.html", + styleUrls: ["./sonarr.component.scss"] }) export class SonarrComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html index 1b44cc362..f57962ac2 100644 --- a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html +++ b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html @@ -1,5 +1,5 @@  - +
The Movie Database
@@ -47,4 +47,5 @@
-
\ No newline at end of file +
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.scss b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.scss new file mode 100644 index 000000000..345e1a9ab --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.scss @@ -0,0 +1,16 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.ts b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.ts index 4fc9138a0..1af63104d 100644 --- a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.ts @@ -14,6 +14,7 @@ interface IKeywordTag { @Component({ templateUrl: "./themoviedb.component.html", + styleUrls: ["./themoviedb.component.scss"] }) export class TheMovieDbComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/update/update.component.html b/src/Ombi/ClientApp/src/app/settings/update/update.component.html index e82fcd30d..990015d76 100644 --- a/src/Ombi/ClientApp/src/app/settings/update/update.component.html +++ b/src/Ombi/ClientApp/src/app/settings/update/update.component.html @@ -1,7 +1,7 @@  -
+
Update Settings
diff --git a/src/Ombi/ClientApp/src/app/settings/update/update.component.scss b/src/Ombi/ClientApp/src/app/settings/update/update.component.scss new file mode 100644 index 000000000..60e52d81a --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/update/update.component.scss @@ -0,0 +1,5 @@ +.small-middle-container{ + margin: auto; + width: 85%; + margin-top:10px; +} diff --git a/src/Ombi/ClientApp/src/app/settings/update/update.component.ts b/src/Ombi/ClientApp/src/app/settings/update/update.component.ts index df0e8b32e..d4648b35b 100644 --- a/src/Ombi/ClientApp/src/app/settings/update/update.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/update/update.component.ts @@ -6,6 +6,7 @@ import { JobService, SettingsService } from "../../services"; @Component({ templateUrl: "./update.component.html", + styleUrls: ["./update.component.scss"] }) export class UpdateComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html index 80331272c..f4e19cb93 100644 --- a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html +++ b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html @@ -1,5 +1,5 @@  - +
User Importer Settings @@ -81,4 +81,5 @@
-
\ No newline at end of file +
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.scss b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.scss new file mode 100644 index 000000000..cf8456528 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.scss @@ -0,0 +1,50 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +.col-md-6{ + display: contents; +} + +.col-md-5{ + display: contents; +} + +.control-label{ + font-weight:400; +} + +.row{ + display:block; +} + +.btn-danger-outline{ + background-color: #E84C3D; +} + +.btn-success-outline{ + background-color: #1b9d1b; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} + +@media (min-width:1440px) { + .col-md-6{ + display: inline-table; + } + + .col-md-5{ + display: inline-table; + } +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.ts index 66babd94a..00483e4f2 100644 --- a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.ts @@ -6,6 +6,7 @@ import { EmbyService, IdentityService, JobService, NotificationService, PlexServ @Component({ templateUrl: "./usermanagement.component.html", + styleUrls: ["./usermanagement.component.scss"] }) export class UserManagementComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html index c5877f3d8..220dcf4c2 100644 --- a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html +++ b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html @@ -1,9 +1,10 @@  +
Vote -
+
@@ -42,9 +43,5 @@
- - - - - -
\ No newline at end of file +
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.scss b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.scss new file mode 100644 index 000000000..345e1a9ab --- /dev/null +++ b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.scss @@ -0,0 +1,16 @@ +@import "~styles/shared.scss"; +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:10px; +} + +::ng-deep .dark .small-middle-container{ + background-color: rgba(0, 0, 0, 0.10); + padding: 2em; +} + +::ng-deep .dark .btn:hover{ + box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15); + color: inherit; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.ts b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.ts index d99239b96..d0804b4b2 100644 --- a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.ts @@ -5,6 +5,7 @@ import { NotificationService, SettingsService } from "../../services"; @Component({ templateUrl: "./vote.component.html", + styleUrls: ["vote.component.scss"] }) export class VoteComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/settings/wiki.component.html b/src/Ombi/ClientApp/src/app/settings/wiki.component.html index c02b42d5b..52cedf6ea 100644 --- a/src/Ombi/ClientApp/src/app/settings/wiki.component.html +++ b/src/Ombi/ClientApp/src/app/settings/wiki.component.html @@ -1,4 +1,4 @@ -
+
- + - - - + +
+
- - + + + + - - - - + + + + - - - - + + + + - + - + - - - + - - - - + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + - - -
@@ -23,97 +25,97 @@ [aria-label]="checkboxLabel(row)"> - + - - Username {{element.userName}} Username {{element.userName}} Alias {{element.alias}} Alias {{element.alias}} Email {{element.emailAddress}} Email {{element.emailAddress}} Requests Remaining
{{'UserManagment.MovieRemaining' | translate: {remaining: u.movieRequestQuota.remaining, total: u.movieRequestLimit} }} -
-
+
+
{{'UserManagment.TvRemaining' | translate: {remaining: u.episodeRequestQuota.remaining, total: u.episodeRequestLimit} }} -
-
+
+
{{'UserManagment.MusicRemaining' | translate: {remaining: u.musicRequestQuota.remaining, total: u.musicRequestLimit} }} -
+
Next Request Due -
+ +
Next Request Due +
{{'UserManagment.MovieDue' | translate: {date: (u.movieRequestQuota.nextRequest | amLocal | amDateFormat: 'l LT')} }} -
-
+
+
{{'UserManagment.TvDue' | translate: {date: (u.episodeRequestQuota.nextRequest | amLocal | amDateFormat: 'l LT')} }} -
-
+
+
{{'UserManagment.MusicDue' | translate: {date: (u.musicRequestQuota.nextRequest | amLocal | amDateFormat: 'l LT')} }} -
-
Last Logged In - + + Last Logged In + {{u.lastLoggedIn | amLocal | amDateFormat: 'l LT'}} - - + + Not logged in yet! - User Type - Local User - Plex User - Emby User User Type + Local User + Plex User + Emby User Roles -
- {{claim.value}} -
-
- - Roles +
+ {{claim.value}} +
+
+ + - +
+ + + @@ -147,4 +149,5 @@ - +
+
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss new file mode 100644 index 000000000..2062e9ab6 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss @@ -0,0 +1,81 @@ +@import "~styles/variables.scss"; + +.small-middle-container{ + margin: auto; + width: 85%; + margin-top:10px; +} + +::ng-deep .dark .content .mat-header-cell { + background: rgba(0, 0, 0, 0.381)!important; + font-size: 1em; + font-weight: 500; + color: rgba(255, 255, 255, 0.842) !important; +} + +::ng-deep .dark .mat-header-cell .mat-checkbox-frame { + border-color: #FFF; +} + + +.mat-form-field { + float:right; +} + +::ng-deep .mat-form-field-label{ + font-size: 1.2em; +} + +::ng-deep .mat-form-field-infix { + width: 10em; + margin-top:1em; +} + +::ng-deep .mat-tab-label{ + opacity: 1; +} + +.content { + margin-top: 2em; +} + +.buttons { + margin-top: 2em; + transition: 0.5s; + & .mat-raised-button { + background: $accent; + color:#fff; + } + :disabled { + opacity:0.4; + } + ::ng-deep .dark & button { + background: $accent-dark !important; + color: #303030 !important; + &:hover{ + box-shadow: 0 1em 1em -0.8em #fff; + transform: translateY(-0.50em); + transition: 0.5s; + background: #fff !important; + } + &:disabled{ + opacity: 0.4; + } + .offset { + box-shadow: + 0.3em 0.3em 0 0 #fff, + inset 0.3em 0.3em 0 0 #fff; + + &:hover, + &:focus { + box-shadow: + 0 0 0 0 #fff, + inset 6em 3.5em 0 0 #fff; + } + } + } +} +/* .dark .buttons button { + background: $accent-dark !important; + color: #303030; +}*/ \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts index 07d54f3d1..2de5aa31b 100644 --- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts +++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts @@ -7,6 +7,7 @@ import { SelectionModel } from "@angular/cdk/collections"; @Component({ templateUrl: "./usermanagement.component.html", + styleUrls: ["./usermanagement.component.scss"], }) export class UserManagementComponent implements OnInit {