diff --git a/src/app/display/display-routing.module.ts b/src/app/display/display-routing.module.ts index 062ab4a..9525432 100644 --- a/src/app/display/display-routing.module.ts +++ b/src/app/display/display-routing.module.ts @@ -58,6 +58,16 @@ const routes: Routes = [ resolve: { kanbanBoard: KanbanService, }, + data: { + autoSwitchable: true + } + }, { + path: 'kanban-fixed', + component: KanbanBoardComponent, + // canActivate: [AuthGuardService, RoleGuardService], + resolve: { + kanbanBoard: KanbanService, + }, data: { autoSwitchable: false } diff --git a/src/app/display/kanban-board/kanban-board.component.ts b/src/app/display/kanban-board/kanban-board.component.ts index a39d19e..0ee329e 100644 --- a/src/app/display/kanban-board/kanban-board.component.ts +++ b/src/app/display/kanban-board/kanban-board.component.ts @@ -1,23 +1,23 @@ -import { Component, HostBinding, HostListener, OnInit } from '@angular/core'; +import { Component, HostBinding, OnInit } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { KanbanBoard, KanbanEntry, KanbanService, } from '../shared'; +import { slideInOutAnimation } from '../../shared/slide-in-out-animation'; const WIP_LIMIT_INPROGRESS = 12; const WIP_LIMIT_VERIFICATION = 8; -const STYLE_HIDDEN = 'hidden'; -const STYLE_VISIBLE = 'scroll'; - @Component({ selector: 'app-kanban-board', templateUrl: './kanban-board.component.html', - styleUrls: ['./kanban-board.component.css'] + styleUrls: ['./kanban-board.component.css'], + animations: [slideInOutAnimation] }) export class KanbanBoardComponent implements OnInit { - @HostBinding('style.overflow') hostOverflow = STYLE_HIDDEN; + @HostBinding('@slideInOutAnimation') + slideIn = true; constructor(private titleService: Title, private route: ActivatedRoute, @@ -91,14 +91,4 @@ export class KanbanBoardComponent implements OnInit { 'over-wip': this.verificationWipCount > WIP_LIMIT_VERIFICATION, }; } - - // @HostListener('mouseover') - // private onMouseOver() { - // this.hostOverflow = STYLE_VISIBLE; - // } - // - // @HostListener('mouseout') - // private onMouseOut() { - // this.hostOverflow = STYLE_HIDDEN; - // } } diff --git a/src/app/display/slide-show.service.ts b/src/app/display/slide-show.service.ts index 386b7ba..3aa56da 100644 --- a/src/app/display/slide-show.service.ts +++ b/src/app/display/slide-show.service.ts @@ -19,6 +19,9 @@ export class SlideShowService { public nextSlide() { if (this.currentSlideIndex === this.slides.length - 1) { + this.currentSlideIndex++; + this.router.navigate(['/kanban']); + } else if (this.currentSlideIndex === this.slides.length) { this.currentSlideIndex = -1; this.reloadSlides(); this.router.navigate(['/commit-tracker']);