diff --git a/src/Ombi/ClientApp/src/app/app.component.html b/src/Ombi/ClientApp/src/app/app.component.html index ef7dab7da..be8bed982 100644 --- a/src/Ombi/ClientApp/src/app/app.component.html +++ b/src/Ombi/ClientApp/src/app/app.component.html @@ -165,7 +165,7 @@ --> - + \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/app.module.ts b/src/Ombi/ClientApp/src/app/app.module.ts index ae167c9c5..7d33aa6fa 100644 --- a/src/Ombi/ClientApp/src/app/app.module.ts +++ b/src/Ombi/ClientApp/src/app/app.module.ts @@ -19,7 +19,7 @@ import { ButtonModule, CaptchaModule, ConfirmationService, ConfirmDialogModule, TooltipModule } from "primeng/primeng"; import { - MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatAutocompleteModule} from '@angular/material'; + MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatAutocompleteModule, MatCheckboxModule} from '@angular/material'; import { MatCardModule, MatInputModule, MatTabsModule } from "@angular/material"; import { MDBBootstrapModule, CardsFreeModule, NavbarModule } from "angular-bootstrap-md"; @@ -118,6 +118,7 @@ export function JwtTokenGetter() { OverlayPanelModule, CommonModule, CardsFreeModule, + MatCheckboxModule, MDBBootstrapModule.forRoot(), JwtModule.forRoot({ config: { diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.html b/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.html index 064d2b501..6ae7363f6 100644 --- a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.html +++ b/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.html @@ -1,10 +1,8 @@ - + {{result.title}} - {{result.title}} -
{{result.title}}
diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.ts b/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.ts index 41088c4ff..a57a40467 100644 --- a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.ts @@ -11,6 +11,7 @@ import { SearchService } from "../../services"; export class DiscoverCardComponent implements OnInit { @Input() public result: IDiscoverCardResult; + public RequestType = RequestType; constructor(private searchService: SearchService) { } diff --git a/src/Ombi/ClientApp/src/app/discover/discover.module.ts b/src/Ombi/ClientApp/src/app/discover/discover.module.ts index 999974994..19ac82b11 100644 --- a/src/Ombi/ClientApp/src/app/discover/discover.module.ts +++ b/src/Ombi/ClientApp/src/app/discover/discover.module.ts @@ -6,10 +6,10 @@ import { SearchService } from "../services"; import { SharedModule } from "../shared/shared.module"; import { DiscoverComponent } from "./discover.component"; import { DiscoverCardComponent } from "./card/discover-card.component"; +import { AuthGuard } from "../auth/auth.guard"; const routes: Routes = [ - { path: "", component: DiscoverComponent }, - { path: "discover", component: DiscoverComponent }, + { path: "", component: DiscoverComponent, canActivate: [AuthGuard] }, ]; @NgModule({ imports: [ diff --git a/src/Ombi/ClientApp/src/app/login/login.component.html b/src/Ombi/ClientApp/src/app/login/login.component.html index 5d5032aef..097f0e85d 100644 --- a/src/Ombi/ClientApp/src/app/login/login.component.html +++ b/src/Ombi/ClientApp/src/app/login/login.component.html @@ -1,14 +1,9 @@ - -
+
-
+
-
@@ -21,39 +16,45 @@ include the remember me checkbox
+
- - -
-
+ \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/login/login.component.scss b/src/Ombi/ClientApp/src/app/login/login.component.scss index bdf1074ac..a194b031b 100644 --- a/src/Ombi/ClientApp/src/app/login/login.component.scss +++ b/src/Ombi/ClientApp/src/app/login/login.component.scss @@ -35,7 +35,7 @@ div.bg { .card-container.card { max-width: 500px; padding: 45px 45px; - background-color: rgba(0,0,0, 0.0); + background-color: rgba(0, 0, 0, 0.7); border-radius: 5%; position: absolute; top: 50%; @@ -43,9 +43,16 @@ div.bg { transform: translate(-50%,-50%); width: 100%; } - - - + +::ng-deep input.mat-input-element { + color: white; // choose the color you want + } +::ng-deep label.mat-input-placeholder { + color: #fff; // choose the color you want + } +.white-checkbox { + color:white; +} .btn { font-weight: 700; @@ -200,3 +207,8 @@ div.bg { ::-ms-input-placeholder { /* Microsoft Edge */ color: $placeholder-colour; } + + +.full-width { + width: 100%; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/login/login.component.ts b/src/Ombi/ClientApp/src/app/login/login.component.ts index 34edcd687..03aafe20b 100644 --- a/src/Ombi/ClientApp/src/app/login/login.component.ts +++ b/src/Ombi/ClientApp/src/app/login/login.component.ts @@ -74,7 +74,7 @@ export class LoginComponent implements OnDestroy, OnInit { }); if (authService.loggedIn()) { - this.router.navigate(["search"]); + this.router.navigate(["/"]); } } @@ -117,7 +117,7 @@ export class LoginComponent implements OnDestroy, OnInit { if (this.authService.loggedIn()) { this.ngOnDestroy(); - this.router.navigate(["search"]); + this.router.navigate(["/"]); } else { this.notify.error(this.errorBody); } 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 204cb7105..9d111663e 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,12 +1,23 @@ - + Ombi - Discover - Search - Requests - Settings + + find_replace + Discover + + search Search + + list Requests + + settings Settings + + + exit_to_app + {{ 'NavigationBar.Logout' | translate }} + + @@ -20,15 +31,18 @@ - + -
+
-
- +
- \ No newline at end of file + + +
+ +
\ 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 9e22ed3d9..808e7f4da 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 @@ -1,7 +1,7 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, Output, EventEmitter } from '@angular/core'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; -import { Observable, Subject } from 'rxjs'; -import { map, debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; @Component({ @@ -16,8 +16,19 @@ export class MyNavComponent { map(result => result.matches) ); - @Input() public showNav: boolean; + @Input() public showNav: boolean; + @Input() public loggedIn: boolean; + @Input() public username: string; + @Output() public logoutClick = new EventEmitter(); constructor(private breakpointObserver: BreakpointObserver) { } + + public logOut() { + this.logoutClick.emit(); + } + + public isLoggedIn(): boolean { + return this.loggedIn; + } } diff --git a/src/Ombi/ClientApp/src/app/shared/shared.module.ts b/src/Ombi/ClientApp/src/app/shared/shared.module.ts index 98ca29d2e..b76f2eeb6 100644 --- a/src/Ombi/ClientApp/src/app/shared/shared.module.ts +++ b/src/Ombi/ClientApp/src/app/shared/shared.module.ts @@ -11,7 +11,7 @@ import { InputSwitchModule, SidebarModule } from "primeng/primeng"; import { MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatTooltipModule} from '@angular/material'; - import { MatCardModule, MatInputModule, MatTabsModule, MatAutocompleteModule } from "@angular/material"; + import { MatCardModule, MatInputModule, MatTabsModule, MatAutocompleteModule, MatCheckboxModule } from "@angular/material"; @NgModule({ declarations: [ @@ -34,6 +34,7 @@ import { MatSidenavModule, MatListModule, MatToolbarModule, + MatCheckboxModule, ], exports: [ TranslateModule, @@ -54,6 +55,7 @@ import { MatToolbarModule, MatTooltipModule, MatAutocompleteModule, + MatCheckboxModule, ], }) export class SharedModule {} diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index 16e902ac7..dc9efb160 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SpaServices.AngularCli; using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.Caching.Memory; @@ -252,6 +253,7 @@ namespace Ombi if (env.IsDevelopment()) { spa.UseProxyToSpaDevelopmentServer("http://localhost:3578"); + //spa.UseAngularCliServer("start"); } }); }