diff --git a/src/app/_models/library.ts b/src/app/_models/library.ts new file mode 100644 index 000000000..edc7c9fdc --- /dev/null +++ b/src/app/_models/library.ts @@ -0,0 +1,3 @@ +export interface Library { + +} \ No newline at end of file diff --git a/src/app/_models/member.ts b/src/app/_models/member.ts index 0b4ee16e6..f8a990f2e 100644 --- a/src/app/_models/member.ts +++ b/src/app/_models/member.ts @@ -1,6 +1,9 @@ +import { Library } from './library'; + export interface Member { username: string; lastActive: string; // datetime created: string; // datetime isAdmin: boolean; + libraries?: Library[]; } \ No newline at end of file diff --git a/src/app/_services/library.service.ts b/src/app/_services/library.service.ts index 6e30f6670..b04dd3bb0 100644 --- a/src/app/_services/library.service.ts +++ b/src/app/_services/library.service.ts @@ -1,6 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'src/environments/environment'; +import { Library } from '../_models/library'; @Injectable({ providedIn: 'root' @@ -20,4 +21,8 @@ export class LibraryService { return this.httpClient.get(this.baseUrl + 'library/list' + query); } + getLibraries() { + return this.httpClient.get(this.baseUrl + 'library'); + } + } diff --git a/src/app/admin/dashboard/dashboard.component.ts b/src/app/admin/dashboard/dashboard.component.ts index ec83c8286..fd3c2a4fa 100644 --- a/src/app/admin/dashboard/dashboard.component.ts +++ b/src/app/admin/dashboard/dashboard.component.ts @@ -15,7 +15,6 @@ export class DashboardComponent implements OnInit { constructor(private router: Router) { // TODO: Depending on active route, set the tab else default to first tab. console.log('current route: ', this.router.url); - //this.router.url === '/login' } ngOnInit(): void { diff --git a/src/app/admin/manage-library/manage-library.component.ts b/src/app/admin/manage-library/manage-library.component.ts index dc1d5947b..8de8a30c6 100644 --- a/src/app/admin/manage-library/manage-library.component.ts +++ b/src/app/admin/manage-library/manage-library.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DirectoryPickerComponent, DirectoryPickerResult } from 'src/app/directory-picker/directory-picker.component'; +import { Library } from 'src/app/_models/library'; +import { LibraryService } from 'src/app/_services/library.service'; @Component({ selector: 'app-manage-library', @@ -9,9 +11,16 @@ import { DirectoryPickerComponent, DirectoryPickerResult } from 'src/app/directo }) export class ManageLibraryComponent implements OnInit { - constructor(private modalService: NgbModal) { } + libraries: Library[] = []; + + constructor(private modalService: NgbModal, private libraryService: LibraryService) { } ngOnInit(): void { + + this.libraryService.getLibraries().subscribe(libraries => { + this.libraries = libraries; + }); + } addFolder(library: string) { diff --git a/src/app/admin/manage-users/manage-users.component.html b/src/app/admin/manage-users/manage-users.component.html index 24ee3fba8..8313dc75f 100644 --- a/src/app/admin/manage-users/manage-users.component.html +++ b/src/app/admin/manage-users/manage-users.component.html @@ -1,10 +1,20 @@ -

Members:

-
    -
  • - {{member.username}} +
    +

    Members

    +
    +
    +
      +
    • +
      +
      Name: {{member.username | titlecase}}
      +
      Sharing: {{member?.libraries ? member?.libraries : 'None'}}
      +
      Last Active: {{member.lastActive | date}}
      +
      + + +
\ No newline at end of file