From 7ffc26ed23a2c599434af08d15cca2e048a39be2 Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Wed, 20 Mar 2019 13:56:05 +0000 Subject: [PATCH] Sorted out the create/manage user page --- .../ClientApp/src/app/shared/shared.module.ts | 5 +- .../usermanagement-user.component.html | 381 ++++++++---------- .../usermanagement-user.component.scss | 6 + .../usermanagement-user.component.ts | 37 +- 4 files changed, 190 insertions(+), 239 deletions(-) create mode 100644 src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.scss diff --git a/src/Ombi/ClientApp/src/app/shared/shared.module.ts b/src/Ombi/ClientApp/src/app/shared/shared.module.ts index 11d65d94a..5fc1da76f 100644 --- a/src/Ombi/ClientApp/src/app/shared/shared.module.ts +++ b/src/Ombi/ClientApp/src/app/shared/shared.module.ts @@ -10,7 +10,8 @@ import { IssuesReportComponent } from "./issues-report.component"; import { InputSwitchModule, SidebarModule } from "primeng/primeng"; import { - MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatTooltipModule, MatSelectModule, MatTableModule, MatPaginatorModule, MatSortModule, MatTreeModule} from '@angular/material'; + MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatTooltipModule, MatSelectModule, MatTableModule, MatPaginatorModule, MatSortModule, + MatTreeModule, MatStepperModule} from '@angular/material'; import { MatCardModule, MatInputModule, MatTabsModule, MatAutocompleteModule, MatCheckboxModule, MatExpansionModule, MatDialogModule, MatProgressSpinnerModule, MatChipsModule } from "@angular/material"; import { EpisodeRequestComponent } from "./episode-request/episode-request.component"; @@ -48,6 +49,7 @@ import { EpisodeRequestComponent } from "./episode-request/episode-request.compo MatPaginatorModule, MatSortModule, MatTreeModule, + MatStepperModule, ], entryComponents: [ EpisodeRequestComponent @@ -83,6 +85,7 @@ import { EpisodeRequestComponent } from "./episode-request/episode-request.compo MatTableModule, MatPaginatorModule, MatSortModule, + MatStepperModule, ], }) export class SharedModule {} diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html index 3f44a808b..8bc212c43 100644 --- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html +++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html @@ -1,224 +1,175 @@ -

Create User

-

User: {{user.userName}}

+ +
- + + + User Details +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+ - -
-
-
-

User Details

+ + + + Choose the Roles +
+
+ {{c.value | humanize}}
-
-

User Settings

+
+ +
+
+ {{c.value | humanize}}
-
-
-
- -
- -
-
-
- -
- -
-
+
+
+ + +
+ + + Set Request Limits -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- - - -
-
- -
-
-
-
- - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
- - - - - -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
-
- - - - - -
-
-
-
- -
- -
-
-
-
-
- - - - - -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
-
- - - - -
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + +
+ + + Notification Preferences +
+
+ + +
-
-
-
- -
- - - +
+
+ + +
+ -
-
-
-
\ No newline at end of file + + Quality & Root Path Preferences + + + + Sonarr Quality Profile + + + {{folder.name}} + + + + + + Sonarr Quality Profile (Anime) + + + {{folder.name}} + + + + + + Sonarr Root Folder + + + {{folder.path}} + + + + + + Sonarr Root Folder (Anime) + + + {{folder.path}} + + + + + + Radarr Quality Profiles + + + {{folder.name}} + + + + + + Radarr Root Folder + + + {{folder.path}} + + + + +
+ + +
+ + + Actions + + +
+ + + + +
+ + + + +
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.scss b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.scss new file mode 100644 index 000000000..482b17951 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.scss @@ -0,0 +1,6 @@ + +.small-middle-container{ + margin: auto; + width: 95%; + margin-top:5%; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts index 59f3ea5d8..9940336ba 100644 --- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts +++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts @@ -2,22 +2,13 @@ import { ActivatedRoute, Router } from "@angular/router"; import { ICheckbox, INotificationAgent, INotificationPreferences, IRadarrProfile, IRadarrRootFolder, ISonarrProfile, ISonarrRootFolder, IUser, UserType } from "../interfaces"; -import { IdentityService, NotificationService, RadarrService, SonarrService } from "../services"; +import { IdentityService, NotificationService, RadarrService, SonarrService, MessageService } from "../services"; import { ConfirmationService } from "primeng/primeng"; @Component({ templateUrl: "./usermanagement-user.component.html", - styles: [` - - ::ng-deep ngb-accordion > div.card > div.card-header { - padding:0px; - } - ::ng-deep ngb-accordion > div.card { - color:white; - padding-top: 0px; - } - `], + styleUrls: ["./usermanagement-user.component.scss"], }) export class UserManagementUserComponent implements OnInit { @@ -36,7 +27,7 @@ export class UserManagementUserComponent implements OnInit { public edit: boolean; constructor(private identityService: IdentityService, - private notificationService: NotificationService, + private notificationService: MessageService, private router: Router, private route: ActivatedRoute, private confirmationService: ConfirmationService, @@ -102,7 +93,7 @@ export class UserManagementUserComponent implements OnInit { if (this.user.password) { if (this.user.password !== this.confirmPass) { - this.notificationService.error("Passwords do not match"); + this.notificationService.send("Passwords do not match"); return; } } @@ -113,17 +104,17 @@ export class UserManagementUserComponent implements OnInit { }); if (!hasClaims) { - this.notificationService.error("Please assign a role"); + this.notificationService.send("Please assign a role"); return; } this.identityService.createUser(this.user).subscribe(x => { if (x.successful) { - this.notificationService.success(`The user ${this.user.userName} has been created successfully`); + this.notificationService.send(`The user ${this.user.userName} has been created successfully`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { - this.notificationService.error(val); + this.notificationService.send(val); }); } }); @@ -138,11 +129,11 @@ export class UserManagementUserComponent implements OnInit { accept: () => { this.identityService.deleteUser(this.user).subscribe(x => { if (x.successful) { - this.notificationService.success(`The user ${this.user.userName} was deleted`); + this.notificationService.send(`The user ${this.user.userName} was deleted`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { - this.notificationService.error(val); + this.notificationService.send(val); }); } @@ -157,11 +148,11 @@ export class UserManagementUserComponent implements OnInit { public resetPassword() { this.identityService.submitResetPassword(this.user.emailAddress).subscribe(x => { if (x.successful) { - this.notificationService.success(`Sent reset password email to ${this.user.emailAddress}`); + this.notificationService.send(`Sent reset password email to ${this.user.emailAddress}`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { - this.notificationService.error(val); + this.notificationService.send(val); }); } @@ -176,18 +167,18 @@ export class UserManagementUserComponent implements OnInit { }); if (!hasClaims) { - this.notificationService.error("Please assign a role"); + this.notificationService.send("Please assign a role"); return; } this.identityService.updateUser(this.user).subscribe(x => { if (x.successful) { this.identityService.updateNotificationPreferences(this.notificationPreferences).subscribe(); - this.notificationService.success(`The user ${this.user.userName} has been updated successfully`); + this.notificationService.send(`The user ${this.user.userName} has been updated successfully`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { - this.notificationService.error(val); + this.notificationService.send(val); }); } });