Skip to content

Added dropdown menu #2

Merged
merged 5 commits into from
Mar 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { NgModule } from '@angular/core';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { HttpClientModule } from '@angular/common/http';
import { TreeModule } from 'primeng/tree';
import { DropdownModule } from 'primeng/dropdown';
import { MainComponent } from './main/main.component';
import { MainCenterComponent } from './main/main-center/main-center.component';
import { TreeComponent } from './main/tree/tree.component';
import { DropdownComponent } from './main/dropdown/dropdown.component';
import { FormsModule } from '@angular/forms';

@NgModule({
declarations: [AppComponent, TreeComponent, MainComponent, MainCenterComponent],
declarations: [AppComponent, TreeComponent, MainComponent, MainCenterComponent, DropdownComponent],
imports: [
BrowserModule,
AppRoutingModule,
FormsModule,
BrowserAnimationsModule,
TreeModule,
DropdownModule,
HttpClientModule
],
providers: [],
Expand Down
Empty file.
4 changes: 4 additions & 0 deletions src/app/main/dropdown/dropdown.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<div class="d-flex align-items-center p-2">
<h3 class="mr-2">End Item: </h3>
<p-dropdown [options]="xaList" [(ngModel)]="selectedEndItem" (onChange)="onChange($event)"></p-dropdown>
</div>
25 changes: 25 additions & 0 deletions src/app/main/dropdown/dropdown.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { DropdownComponent } from './dropdown.component';

describe('DropdownComponent', () => {
let component: DropdownComponent;
let fixture: ComponentFixture<DropdownComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ DropdownComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(DropdownComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
29 changes: 29 additions & 0 deletions src/app/main/dropdown/dropdown.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { Component, OnInit } from '@angular/core';
import { EndItemService } from 'src/app/services/enditem.service';
import { SelectItem } from 'primeng/api';

@Component({
selector: 'app-dropdown',
templateUrl: './dropdown.component.html',
styleUrls: ['./dropdown.component.css']
})
export class DropdownComponent {

constructor(
private endItemService: EndItemService
) {}

// TODO replace with backend.
xaList: SelectItem[] = [
{ label: 'None selected', value: null },
{ label: 'UConn', value: 'Uconn' },
{ label: 'Test', value: 'Test' }
];

selectedEndItem = '';

onChange(event: any) {
this.endItemService.setEndItem(this.selectedEndItem);
}

}
2 changes: 1 addition & 1 deletion src/app/main/main-center/main-center.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ <h1 class="ml-2">No node selected</h1>

<ng-template #noPdf>
<h1 class="ml-4 mt-4 text-danger">PDF not found</h1>
</ng-template>
</ng-template>
5 changes: 4 additions & 1 deletion src/app/main/main.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<div class="d-flex h-100 w-100">
<div class="bg-secondary">
<app-dropdown></app-dropdown>
</div>
<div *ngIf="endItemService.endItem$ | async" class="d-flex h-100 w-100" >
<app-tree></app-tree>
<app-main-center class="w-100"></app-main-center>
</div>
5 changes: 4 additions & 1 deletion src/app/main/main.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { EndItemService } from '../services/enditem.service';

@Component({
selector: 'app-main',
Expand All @@ -7,7 +8,9 @@ import { Component, OnInit } from '@angular/core';
})
export class MainComponent implements OnInit {

constructor() { }
constructor(
private endItemService: EndItemService
) { }

ngOnInit() {
}
Expand Down
17 changes: 14 additions & 3 deletions src/app/main/tree/tree.component.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { TreeNode } from 'primeng/api';
import { Subscription } from 'rxjs';
import { NodeService } from 'src/app/services/node.service';
import { TreeService } from 'src/app/services/tree.service';
import { EndItemService } from 'src/app/services/enditem.service';

@Component({
selector: 'app-tree',
templateUrl: './tree.component.html',
styleUrls: ['./tree.component.css']
})
export class TreeComponent implements OnInit {
export class TreeComponent implements OnInit, OnDestroy {

private dropdownSubscription: Subscription;

selectedEndItem: string;
filesTree: TreeNode[];

constructor(
private treeService: TreeService,
private nodeService: NodeService
private nodeService: NodeService,
private endItemService: EndItemService
) { }

ngOnInit() {
this.dropdownSubscription = this.endItemService.endItem$.subscribe(xa => this.selectedEndItem = xa);
this.nodeService.getFiles().then(files => (this.filesTree = files));
}

nodeSelect(event: { node: TreeNode }) {
this.treeService.changeNode(event.node);
}

ngOnDestroy() {
this.dropdownSubscription.unsubscribe();
}

}
16 changes: 16 additions & 0 deletions src/app/services/enditem.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { BehaviorSubject } from 'rxjs';
import { Injectable } from '@angular/core';

@Injectable({
providedIn: 'root'
})
export class EndItemService {

private selectedEndItem = new BehaviorSubject<string>(null);
endItem$ = this.selectedEndItem.asObservable();

setEndItem(endItem: string) {
this.selectedEndItem.next(endItem);
}

}