diff --git a/.gitignore b/.gitignore index 8f746f0..a96070b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ # See http://help.github.com/ignore-files/ for more about ignoring files. +# dynamic generated by deployer on remote host +revision.json + # compiled output /semantic /dist diff --git a/deploy.php b/deploy.php index 3de6e74..82cd47f 100644 --- a/deploy.php +++ b/deploy.php @@ -16,7 +16,7 @@ set('keep_releases', 3); set('default_stage', 'production'); // Servers -server('vasgyuro', 'vasgyuro.tsp') +host('vasgyuro.tsp') ->stage('production') ->user('edvidan') ->forwardAgent() @@ -40,6 +40,11 @@ task('deploy:ng-upload', function() { run("rm -f {{release_path}}/dist.tar.xz"); runLocally("rm -rf dist.tar.xz dist"); upload("htaccess", "{{release_path}}/dist/.htaccess"); + + $revision = get("release_name"); + within('{{release_path}}', function () use ($revision){ + run("echo $revision > dist/revision.json"); + }); }); desc('Deploy your project'); diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 739284f..ac290af 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -7,7 +7,8 @@ import { KanbanBoardComponent } from "./kanban/kanban-board/kanban-board.compone const routes: Routes = [ { path: '', - children: [] + redirectTo: '/kanban', + pathMatch: 'full', },{ path: 'kanban', children: [], diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3fa81f4..bd8215f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -4,7 +4,9 @@ import {TimerObservable} from "rxjs/observable/TimerObservable"; import {KanbanService} from "./kanban/shared/kanban.service"; import {Router} from "@angular/router"; +import {SelfUpdaterService} from "./kanban/shared/self-updater.service"; +const TIMER_DEPLOY_REFRESH = 30000; const TIMER_JIRA_REFRESH = 60000; const TIMER_PAGE_SWITCH = 300000; @@ -16,15 +18,21 @@ const TIMER_PAGE_SWITCH = 300000; }) export class AppComponent implements OnInit, OnDestroy { + selfUpdateCheckerTimer: Subscription; reloadJiraIssueTimer: Subscription; pageSwitchTimer: Subscription; constructor( + private selfUpdaterService: SelfUpdaterService, private kanbanService: KanbanService, private router: Router ) {} public ngOnInit() { + let timer0 = TimerObservable.create(TIMER_DEPLOY_REFRESH, TIMER_JIRA_REFRESH); + this.selfUpdateCheckerTimer = timer0.subscribe(() => { + this.selfUpdaterService.checkAndReloadIfNecessary(); + }); let timer1 = TimerObservable.create(TIMER_JIRA_REFRESH, TIMER_JIRA_REFRESH); this.reloadJiraIssueTimer = timer1.subscribe(() => { this.kanbanService.reload(); @@ -38,6 +46,7 @@ export class AppComponent implements OnInit, OnDestroy { } public ngOnDestroy() { + this.selfUpdateCheckerTimer.unsubscribe(); this.reloadJiraIssueTimer.unsubscribe(); this.pageSwitchTimer.unsubscribe(); } diff --git a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.css b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.css index 8d58736..cf5a185 100644 --- a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.css +++ b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.css @@ -16,14 +16,36 @@ border-radius: 4px; } -.ui.divided.items > .item:first-child { - border-top: 0; +.ui.divided.items > .item:last-child { + border-bottom: 0 !important; } .ui.divided.items > .item { - border-top: 1px solid rgba(250, 250, 250, 0.25); + border-bottom: 1px solid rgba(250, 250, 250, 0.25); } .ui.label { opacity: 0.85; -} \ No newline at end of file + font-weight: bold; +} + +.ui.divided.items > .item.blocker.bottom-separator { + border-bottom: 1px solid rgba(219, 40, 40, 0.5); +} + +.ui.divided.items > .item.critical.bottom-separator { + border-bottom: 1px solid rgba(242, 113, 28, 0.5); +} + +.ui.divided.items > .item.major.bottom-separator { + border-bottom: 1px solid rgba(181, 204, 24, 0.5); +} + +.ui.divided.items > .item.minor.bottom-separator { + border-bottom: 1px solid rgba(0, 181, 173, 0.5); +} + +/*Nothing below trivial, no separator needed*/ +/*.ui.divided.items > .item.trivial.bottom-separator {*/ + /*border-bottom: 1px solid rgba(181, 204, 24, 0.5);*/ +/*}*/ diff --git a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html index 64892df..23209af 100644 --- a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html +++ b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html @@ -1,6 +1,6 @@