From fd299b92ee802dfb1e32a1d19b3c5eeb79777117 Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Thu, 7 Mar 2019 11:18:27 +0000 Subject: [PATCH] a bit more wip on the login page and fixed the approve/deny on the movie page --- .../src/app/login/login.component.html | 118 +++++++++++------- .../src/app/login/login.component.scss | 17 ++- .../movie/movie-details.component.ts | 6 +- .../mediaserver/mediaserver.component.ts | 1 + .../ClientApp/src/app/wizard/wizard.module.ts | 2 + src/Ombi/ClientApp/src/index.html | 6 +- 6 files changed, 91 insertions(+), 59 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/login/login.component.html b/src/Ombi/ClientApp/src/app/login/login.component.html index 097f0e85d..5742bcc9d 100644 --- a/src/Ombi/ClientApp/src/app/login/login.component.html +++ b/src/Ombi/ClientApp/src/app/login/login.component.html @@ -1,60 +1,84 @@ -
+ +
+
+
- -
-
- -
- -
-
- -
-

- -
- - - - - - -
- -
- - -
+ + +
+
- +
--> +
\ 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 a194b031b..fa2b609f4 100644 --- a/src/Ombi/ClientApp/src/app/login/login.component.scss +++ b/src/Ombi/ClientApp/src/app/login/login.component.scss @@ -44,12 +44,7 @@ div.bg { 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; } @@ -211,4 +206,14 @@ div.bg { .full-width { width: 100%; +} + +.small-middle-container{ + margin: auto; + width: 25%; + overflow: auto; +} + +.top-margin { + margin-top:10%; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/movie/movie-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/movie/movie-details.component.ts index d00a0f2de..734f55fd7 100644 --- a/src/Ombi/ClientApp/src/app/media-details/movie/movie-details.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/movie/movie-details.component.ts @@ -85,7 +85,7 @@ export class MovieDetailsComponent { } public async deny() { - const result = await this.requestService.denyMovie({ id: this.theMovidDbId, reason: "" }).toPromise(); + const result = await this.requestService.denyMovie({ id: this.movieRequest.id, reason: "" }).toPromise(); if (result.result) { this.movie.approved = false; this.messageService.send(result.message, "Ok"); @@ -95,10 +95,10 @@ export class MovieDetailsComponent { } public async approve() { - const result = await this.requestService.approveMovie({ id: this.theMovidDbId }).toPromise(); + const result = await this.requestService.approveMovie({ id: this.movieRequest.id }).toPromise(); if (result.result) { this.movie.approved = false; - this.messageService.send(result.message, "Ok"); + this.messageService.send("Successfully Approved", "Ok"); } else { this.messageService.send(result.errorMessage, "Ok"); } diff --git a/src/Ombi/ClientApp/src/app/wizard/mediaserver/mediaserver.component.ts b/src/Ombi/ClientApp/src/app/wizard/mediaserver/mediaserver.component.ts index 84958152e..531d8bdc9 100644 --- a/src/Ombi/ClientApp/src/app/wizard/mediaserver/mediaserver.component.ts +++ b/src/Ombi/ClientApp/src/app/wizard/mediaserver/mediaserver.component.ts @@ -4,6 +4,7 @@ import { Component, OnInit } from "@angular/core"; @Component({ templateUrl: "./mediaserver.component.html", styleUrls: ["./mediaserver.component.scss"], + selector: "wizard-media-server", }) export class MediaServerComponent implements OnInit { diff --git a/src/Ombi/ClientApp/src/app/wizard/wizard.module.ts b/src/Ombi/ClientApp/src/app/wizard/wizard.module.ts index 7020c3fc2..d9c056ba0 100644 --- a/src/Ombi/ClientApp/src/app/wizard/wizard.module.ts +++ b/src/Ombi/ClientApp/src/app/wizard/wizard.module.ts @@ -4,6 +4,7 @@ import { FormsModule } from "@angular/forms"; import { RouterModule, Routes } from "@angular/router"; import {ConfirmationService, ConfirmDialogModule } from "primeng/primeng"; +import { MatStepperModule } from "@angular/material"; import { CreateAdminComponent } from "./createadmin/createadmin.component"; import { EmbyComponent } from "./emby/emby.component"; @@ -45,6 +46,7 @@ const routes: Routes = [ IdentityService, EmbyService, ConfirmationService, + MatStepperModule, PlexOAuthService, ], diff --git a/src/Ombi/ClientApp/src/index.html b/src/Ombi/ClientApp/src/index.html index b78186e88..e2b1bfbc2 100644 --- a/src/Ombi/ClientApp/src/index.html +++ b/src/Ombi/ClientApp/src/index.html @@ -9,9 +9,9 @@ if (existingBaseUrl && existingBaseUrl.length === 0) { document.write(''); if (existingBaseUrl.length === 0) { - document.write("") + document.write("") } else { - document.write("") + document.write("") } } else { // Work out the base URL @@ -31,7 +31,7 @@ const data = JSON.parse(xmlhttp.responseText); hasFile = true; document.write(''); - document.write("") + document.write("") window.localStorage.setItem("baseUrl", data); function tryGetBaseUrl(xmlhttp, url) {