From 92075625457ba2f1ac2380e2b89e23c65159acbf Mon Sep 17 00:00:00 2001 From: Jesse Lucas Date: Thu, 19 Mar 2020 18:05:04 -0400 Subject: [PATCH] refactor status toggle to list toggle --- .../list-toggle/list-toggle.component.html | 4 +++ .../list-toggle.component.scss} | 0 .../list-toggle/list-toggle.component.spec.ts | 25 +++++++++++++++ src/app/list-toggle/list-toggle.component.ts | 31 +++++++++++++++++++ src/app/{status.ts => list-type.ts} | 2 +- .../status-list/status-list.component.html | 6 ++-- .../list/status-list/status-list.component.ts | 10 +++--- .../status-toggle.component.html | 4 --- .../status-toggle.component.spec.ts | 25 --------------- .../status-toggle/status-toggle.component.ts | 31 ------------------- 10 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 src/app/list-toggle/list-toggle.component.html rename src/app/{status-toggle/status-toggle.component.scss => list-toggle/list-toggle.component.scss} (100%) create mode 100644 src/app/list-toggle/list-toggle.component.spec.ts create mode 100644 src/app/list-toggle/list-toggle.component.ts rename src/app/{status.ts => list-type.ts} (57%) delete mode 100644 src/app/status-toggle/status-toggle.component.html delete mode 100644 src/app/status-toggle/status-toggle.component.spec.ts delete mode 100644 src/app/status-toggle/status-toggle.component.ts diff --git a/src/app/list-toggle/list-toggle.component.html b/src/app/list-toggle/list-toggle.component.html new file mode 100644 index 000000000..16b2bec0d --- /dev/null +++ b/src/app/list-toggle/list-toggle.component.html @@ -0,0 +1,4 @@ + + Folders + Devices + \ No newline at end of file diff --git a/src/app/status-toggle/status-toggle.component.scss b/src/app/list-toggle/list-toggle.component.scss similarity index 100% rename from src/app/status-toggle/status-toggle.component.scss rename to src/app/list-toggle/list-toggle.component.scss diff --git a/src/app/list-toggle/list-toggle.component.spec.ts b/src/app/list-toggle/list-toggle.component.spec.ts new file mode 100644 index 000000000..77e0653dc --- /dev/null +++ b/src/app/list-toggle/list-toggle.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ListToggleComponent } from './list-toggle.component'; + +describe('ListToggleComponent', () => { + let component: ListToggleComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ListToggleComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ListToggleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/list-toggle/list-toggle.component.ts b/src/app/list-toggle/list-toggle.component.ts new file mode 100644 index 000000000..db5d523f3 --- /dev/null +++ b/src/app/list-toggle/list-toggle.component.ts @@ -0,0 +1,31 @@ +import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { ListType } from '../list-type'; + + + +@Component({ + selector: 'app-list-toggle', + templateUrl: './list-toggle.component.html', + styleUrls: ['./list-toggle.component.scss'] +}) + +export class ListToggleComponent implements OnInit { + public listType = ListType; + @Output() listTypeEvent = new EventEmitter(); + + constructor() { } + ngOnInit(): void { + } + + onSelect(t: ListType): void { + this.listTypeEvent.emit(t); + switch (t) { + case ListType.Folders: + console.log("folder action"); + break; + case ListType.Devices: + console.log("Device action"); + break; + } + } +} \ No newline at end of file diff --git a/src/app/status.ts b/src/app/list-type.ts similarity index 57% rename from src/app/status.ts rename to src/app/list-type.ts index 872798394..9aa953a9c 100644 --- a/src/app/status.ts +++ b/src/app/list-type.ts @@ -1,4 +1,4 @@ -export enum Status { +export enum ListType { Folders = 1, Devices, } \ No newline at end of file diff --git a/src/app/list/status-list/status-list.component.html b/src/app/list/status-list/status-list.component.html index 478293d42..0ac37624e 100644 --- a/src/app/list/status-list/status-list.component.html +++ b/src/app/list/status-list/status-list.component.html @@ -1,10 +1,10 @@
Status - +
- - + +
\ No newline at end of file diff --git a/src/app/list/status-list/status-list.component.ts b/src/app/list/status-list/status-list.component.ts index 7f5a8a6cf..de2f2dfba 100644 --- a/src/app/list/status-list/status-list.component.ts +++ b/src/app/list/status-list/status-list.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Status } from '../../status'; +import { ListType } from '../../list-type'; import { cardElevation } from '../../style'; @@ -9,8 +9,8 @@ import { cardElevation } from '../../style'; styleUrls: ['./status-list.component.scss'] }) export class StatusListComponent implements OnInit { - currentStatus: Status = Status.Folders; - status = Status; // used in html + currentListType: ListType = ListType.Folders; + listType = ListType; // used in html elevation: string = cardElevation; constructor() { } @@ -18,7 +18,7 @@ export class StatusListComponent implements OnInit { ngOnInit(): void { } - onToggle(s: Status) { - this.currentStatus = s; + onToggle(t: ListType) { + this.currentListType = t; } } diff --git a/src/app/status-toggle/status-toggle.component.html b/src/app/status-toggle/status-toggle.component.html deleted file mode 100644 index 58b10e4fc..000000000 --- a/src/app/status-toggle/status-toggle.component.html +++ /dev/null @@ -1,4 +0,0 @@ - - Folders - Devices - \ No newline at end of file diff --git a/src/app/status-toggle/status-toggle.component.spec.ts b/src/app/status-toggle/status-toggle.component.spec.ts deleted file mode 100644 index 329733ba3..000000000 --- a/src/app/status-toggle/status-toggle.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { StatusToggleComponent } from './status-toggle.component'; - -describe('StatusToggleComponent', () => { - let component: StatusToggleComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ StatusToggleComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(StatusToggleComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/status-toggle/status-toggle.component.ts b/src/app/status-toggle/status-toggle.component.ts deleted file mode 100644 index 6557ad626..000000000 --- a/src/app/status-toggle/status-toggle.component.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; -import { Status } from '../status'; - - - -@Component({ - selector: 'app-status-toggle', - templateUrl: './status-toggle.component.html', - styleUrls: ['./status-toggle.component.scss'] -}) - -export class StatusToggleComponent implements OnInit { - public status = Status - @Output() statusEvent = new EventEmitter(); - - constructor() { } - ngOnInit(): void { - } - - onSelect(s: Status): void { - this.statusEvent.emit(s); - switch (s) { - case Status.Folders: - console.log("folder action"); - break; - case Status.Devices: - console.log("Device action"); - break; - } - } -} \ No newline at end of file