diff --git a/src/app/_services/account.service.ts b/src/app/_services/account.service.ts index 77bf4fa73..a9f5ebb81 100644 --- a/src/app/_services/account.service.ts +++ b/src/app/_services/account.service.ts @@ -44,13 +44,9 @@ export class AccountService { if (model?.isAdmin) { model.isAdmin = false; } - + return this.httpClient.post(this.baseUrl + 'account/register', model).pipe( map((user: User) => { - if (user && login) { - //this.setCurrentUser(user); // Register should not act as if a user has logged in - } - return user; }) ); diff --git a/src/app/_services/library.service.ts b/src/app/_services/library.service.ts index b04dd3bb0..2a3d32f86 100644 --- a/src/app/_services/library.service.ts +++ b/src/app/_services/library.service.ts @@ -25,4 +25,8 @@ export class LibraryService { return this.httpClient.get(this.baseUrl + 'library'); } + getLibrariesForMember(username: string) { + return this.httpClient.get(this.baseUrl + 'library/' + username); + } + } diff --git a/src/app/member.service.ts b/src/app/_services/member.service.ts similarity index 90% rename from src/app/member.service.ts rename to src/app/_services/member.service.ts index ce1056e67..2ebb40cba 100644 --- a/src/app/member.service.ts +++ b/src/app/_services/member.service.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'src/environments/environment'; -import { Member } from './_models/member'; +import { Member } from '../_models/member'; @Injectable({ providedIn: 'root' diff --git a/src/app/admin/_modals/library-access-modal/library-access-modal.component.html b/src/app/admin/_modals/library-access-modal/library-access-modal.component.html index fe08a02b1..f6828883d 100644 --- a/src/app/admin/_modals/library-access-modal/library-access-modal.component.html +++ b/src/app/admin/_modals/library-access-modal/library-access-modal.component.html @@ -1 +1,22 @@ -

library-access-modal works!

+ + + + diff --git a/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts b/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts index 1766ce528..da4943d1d 100644 --- a/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts +++ b/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts @@ -1,5 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; +import { FormBuilder } from '@angular/forms'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { Library } from 'src/app/_models/library'; import { Member } from 'src/app/_models/member'; +import { LibraryService } from 'src/app/_services/library.service'; @Component({ selector: 'app-library-access-modal', @@ -9,10 +13,26 @@ import { Member } from 'src/app/_models/member'; export class LibraryAccessModalComponent implements OnInit { @Input() member: Member | undefined; + libraries: Library[] = []; - constructor() { } + constructor(public modal: NgbActiveModal, private libraryService: LibraryService, private fb: FormBuilder) { } ngOnInit(): void { + this.libraryService.getLibrariesForMember(this.member?.username + '').subscribe(libs => { + this.libraries = libs; + }); + } + + close() { + this.modal.close(); + } + + save() { + + } + + reset() { + } } diff --git a/src/app/admin/manage-users/manage-users.component.ts b/src/app/admin/manage-users/manage-users.component.ts index 5ea1ede42..80bb72587 100644 --- a/src/app/admin/manage-users/manage-users.component.ts +++ b/src/app/admin/manage-users/manage-users.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { take } from 'rxjs/operators'; -import { MemberService } from 'src/app/member.service'; +import { MemberService } from 'src/app/_services/member.service'; import { Member } from 'src/app/_models/member'; import { User } from 'src/app/_models/user'; import { AccountService } from 'src/app/_services/account.service'; diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 16cc040e3..9954cc9cf 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,10 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { MemberService } from '../member.service'; -import { User } from '../_models/user'; +import { MemberService } from '../_services/member.service'; import { AccountService } from '../_services/account.service'; @Component({ diff --git a/src/app/library/library.component.ts b/src/app/library/library.component.ts index 2f302d352..b33f10b9c 100644 --- a/src/app/library/library.component.ts +++ b/src/app/library/library.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { take } from 'rxjs/operators'; -import { MemberService } from '../member.service'; import { Library } from '../_models/library'; import { User } from '../_models/user'; import { AccountService } from '../_services/account.service'; import { LibraryService } from '../_services/library.service'; +import { MemberService } from '../_services/member.service'; @Component({ selector: 'app-library', diff --git a/src/app/shared/register-member/register-member.component.ts b/src/app/shared/register-member/register-member.component.ts index 092addd55..640f3c1d1 100644 --- a/src/app/shared/register-member/register-member.component.ts +++ b/src/app/shared/register-member/register-member.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormGroup, FormControl, Validators } from '@angular/forms'; -import { MemberService } from 'src/app/member.service'; +import { MemberService } from 'src/app/_services/member.service'; import { Member } from 'src/app/_models/member'; import { AccountService } from 'src/app/_services/account.service'; @@ -23,7 +23,7 @@ export class RegisterMemberComponent implements OnInit { constructor(private accountService: AccountService, private memberService: MemberService) { this.memberService.getMembers().subscribe(members => { - this.adminExists = members.filter(m => m.isAdmin).length > 0; + this.adminExists = members.filter((m: Member) => m.isAdmin).length > 0; if (!this.adminExists) { this.registerForm.get('isAdmin')?.setValue(true); this.model.isAdmin = true;