From 906e1cd4e2c8a4993fd89a6adbd9a500bf496909 Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Mon, 1 Jul 2019 23:23:59 +0200 Subject: [PATCH] refactor: code formatting for ts --- src/app/app.module.ts | 2 +- src/app/core-ui/core-ui.module.ts | 10 +- src/app/core-ui/layout/layout.module.ts | 12 +- src/app/core-ui/layout/layout.service.ts | 8 +- .../core-ui/layout/store/layout.actions.ts | 2 +- .../core-ui/layout/store/layout.effects.ts | 10 +- .../core-ui/layout/store/layout.reducer.ts | 4 +- .../main-header/main-header.component.ts | 26 +- .../core-ui/main-header/main-header.module.ts | 16 +- src/app/core-ui/shortcut/shortcut.module.ts | 6 +- src/app/core-ui/shortcut/shortcut.service.ts | 26 +- src/app/core/banner/banner.module.ts | 8 +- src/app/core/banner/banner.service.spec.ts | 4 +- .../core/banner/banner/banner.component.ts | 14 +- .../chrome-extension-interface.module.ts | 4 +- .../chrome-extension-interface.service.ts | 8 +- .../core/compression/compression.module.ts | 7 +- .../compression/compression.service.spec.ts | 4 +- src/app/core/core.module.spec.ts | 2 +- src/app/core/core.module.ts | 18 +- .../core/drop-paste-input/drop-paste-input.ts | 2 +- src/app/core/notify/notify.module.ts | 4 +- src/app/core/persistence/database.service.ts | 4 +- src/app/core/persistence/local-storage.ts | 2 +- .../core/persistence/persistence.module.ts | 4 +- .../snack-custom/snack-custom.component.ts | 12 +- src/app/core/snack/snack.model.ts | 6 +- src/app/core/snack/snack.module.ts | 18 +- src/app/core/snack/snack.service.ts | 8 +- src/app/core/snack/store/snack.actions.ts | 4 +- src/app/core/snack/store/snack.effects.ts | 18 +- src/app/core/snack/store/snack.reducer.ts | 2 +- .../attachment-link.directive.ts | 12 +- .../attachment-list.component.ts | 12 +- .../features/attachment/attachment.model.ts | 2 +- .../features/attachment/attachment.module.ts | 22 +- .../features/attachment/attachment.service.ts | 32 +- .../dialog-edit-attachment.component.ts | 8 +- .../attachment/store/attachment.actions.ts | 8 +- .../attachment/store/attachment.effects.ts | 18 +- .../attachment/store/attachment.reducer.ts | 10 +- .../bookmark-bar/bookmark-bar.component.ts | 20 +- .../bookmark-link/bookmark-link.directive.ts | 12 +- src/app/features/bookmark/bookmark.model.ts | 2 +- src/app/features/bookmark/bookmark.module.ts | 22 +- src/app/features/bookmark/bookmark.service.ts | 16 +- .../dialog-edit-bookmark.component.scss | 1 + .../bookmark/store/bookmark.actions.ts | 8 +- .../bookmark/store/bookmark.effects.ts | 16 +- .../bookmark/store/bookmark.reducer.spec.ts | 4 +- .../bookmark/store/bookmark.reducer.ts | 8 +- .../config-form/config-form.component.ts | 10 +- .../config-section.component.ts | 18 +- src/app/features/config/config.module.ts | 30 +- .../config/form-cfgs/keyboard-form.const.ts | 2 +- .../config/form-cfgs/pomodoro-form.const.ts | 2 +- .../form-cfgs/take-a-break-form.const.ts | 2 +- .../config/global-config-form-config.const.ts | 8 +- .../features/config/global-config.model.ts | 4 +- .../features/config/global-config.service.ts | 6 +- .../keyboard-input.component.ts | 8 +- .../config/store/global-config.actions.ts | 4 +- .../config/store/global-config.effects.ts | 24 +- ...ialog-confirm-drive-sync-load.component.ts | 4 +- ...ialog-confirm-drive-sync-save.component.ts | 4 +- .../google/google-drive-sync.service.ts | 18 +- .../google-sync-cfg.component.html | 20 +- .../google-sync-cfg.component.scss | 2 +- .../google-sync-cfg.component.ts | 29 +- src/app/features/google/google.module.ts | 22 +- .../google/store/google-drive-sync.actions.ts | 2 +- .../google/store/google-drive-sync.effects.ts | 4 +- .../google/store/google-drive-sync.reducer.ts | 4 +- .../dialog-github-initial-setup.component.ts | 13 +- .../issue/github/github-api.service.ts | 30 +- .../github-issue-content.component.ts | 12 +- .../github-issue-header.component.ts | 4 +- .../github-issue/github-issue-map.util.ts | 6 +- .../github-issue/github-issue.module.ts | 20 +- .../github-issue/github-issue.service.ts | 26 +- .../store/github-issue.actions.ts | 9 +- .../store/github-issue.effects.ts | 42 +- .../store/github-issue.reducer.ts | 14 +- src/app/features/issue/github/github.const.ts | 4 +- .../features/issue/github/github.module.ts | 8 +- .../issue-content/issue-content.component.ts | 6 +- .../issue-header/issue-header.component.ts | 6 +- .../issue/issue-icon/issue-icon.pipe.ts | 6 +- src/app/features/issue/issue.const.ts | 8 +- src/app/features/issue/issue.d.ts | 12 +- src/app/features/issue/issue.module.ts | 14 +- src/app/features/issue/issue.selector.ts | 8 +- src/app/features/issue/issue.service.ts | 24 +- .../dialog-jira-initial-setup.component.ts | 2 +- .../dialog-jira-transition.component.html | 2 +- .../dialog-jira-transition.component.ts | 20 +- .../issue/jira/jira-cfg/jira-cfg.component.ts | 28 +- .../jira-issue-content.component.ts | 14 +- .../jira-issue-header.component.ts | 4 +- .../issue/jira/jira-issue/jira-issue.model.ts | 7 +- .../jira/jira-issue/jira-issue.module.ts | 22 +- .../jira/jira-issue/jira-issue.service.ts | 26 +- .../jira-issue/store/jira-issue.actions.ts | 8 +- .../jira-issue/store/jira-issue.reducer.ts | 14 +- src/app/features/issue/jira/jira.d.ts | 2 +- src/app/features/issue/jira/jira.module.ts | 20 +- .../evaluation-sheet.component.ts | 2 +- .../improvement-banner.component.ts | 1 - .../metric/improvement/improvement.service.ts | 14 +- .../improvement/store/improvement.actions.ts | 6 +- .../improvement/store/improvement.effects.ts | 20 +- .../improvement/store/improvement.reducer.ts | 8 +- src/app/features/metric/metric.module.ts | 6 - .../metric/obstruction/obstruction.service.ts | 15 +- .../obstruction/store/obstruction.effects.ts | 20 +- .../dialog-add-note-reminder.component.ts | 2 +- .../dialog-add-note.component.ts | 2 +- .../dialog-view-note-reminder.component.ts | 18 +- src/app/features/note/note.module.ts | 34 +- src/app/features/note/note.service.ts | 22 +- src/app/features/note/note/note.component.ts | 12 +- .../features/note/notes/notes.component.ts | 22 +- src/app/features/note/store/note.actions.ts | 8 +- src/app/features/note/store/note.effects.ts | 18 +- src/app/features/note/store/note.reducer.ts | 8 +- .../planning-mode/planning-mode.service.ts | 10 +- .../dialog-pomodoro-break.component.ts | 10 +- src/app/features/pomodoro/pomodoro.module.ts | 16 +- .../pomodoro/store/pomodoro.actions.ts | 2 +- .../pomodoro/store/pomodoro.reducer.ts | 4 +- .../procrastination.component.spec.ts | 8 +- .../procrastination.component.ts | 5 +- .../project/project-form-cfg.const.ts | 4 +- src/app/features/project/project.model.ts | 20 +- src/app/features/project/project.module.ts | 22 +- src/app/features/project/project.service.ts | 2 +- .../features/project/store/project.actions.ts | 1 + .../features/project/store/project.reducer.ts | 2 +- src/app/features/reminder/reminder.module.ts | 26 +- .../dialog-simple-task-export.component.ts | 8 +- .../simple-task-export.module.ts | 12 +- .../simple-task-export.component.ts | 20 +- ...log-edit-task-repeat-cfg.component.spec.ts | 8 +- .../dialog-edit-task-repeat-cfg.component.ts | 2 +- .../store/task-repeat-cfg.effects.ts | 3 +- .../store/task-repeat-cfg.reducer.ts | 68 +- .../add-task-bar/add-task-bar.component.ts | 24 +- .../dialog-add-task-reminder.component.ts | 14 +- .../dialog-time-estimate.component.ts | 14 +- .../features/tasks/filter-done-tasks.pipe.ts | 4 +- .../select-task/select-task.component.ts | 12 +- .../task-additional-info.component.html | 3 +- .../task-additional-info.component.scss | 2 +- .../task-additional-info.component.ts | 14 +- .../tasks/task-list/task-list.component.html | 2 +- .../tasks/task-list/task-list.component.ts | 28 +- .../task-summary-table.component.spec.ts | 8 +- src/app/features/tasks/task.model.ts | 4 +- src/app/features/tasks/tasks.module.ts | 40 +- .../tasks/util/calc-total-time-spent.ts | 2 +- .../features/tasks/util/create-task-copy.ts | 4 +- src/app/features/tasks/util/get-today-str.ts | 2 +- .../dialog-idle/dialog-idle.component.html | 4 +- .../dialog-idle/dialog-idle.component.ts | 2 +- .../take-a-break/take-a-break.module.ts | 4 +- .../time-tracking/time-tracking.module.ts | 18 +- .../time-tracking.service.spec.ts | 8 +- .../time-tracking/time-tracking.service.ts | 12 +- .../dialog-worklog-export.component.ts | 8 +- .../worklog/map-archive-to-worklog.ts | 10 +- .../worklog-export.component.ts | 30 +- .../worklog-week.component.spec.ts | 8 +- .../worklog-week/worklog-week.component.ts | 18 +- .../features/worklog/worklog.component.scss | 2 +- src/app/features/worklog/worklog.module.ts | 16 +- .../features/worklog/worklog.service.spec.ts | 4 +- src/app/imex/file-imex/file-imex.component.ts | 2 +- src/app/imex/file-imex/file-imex.module.ts | 10 +- src/app/imex/imex-meta/imex-meta.module.ts | 7 +- .../imex/imex-meta/imex-meta.service.spec.ts | 4 +- src/app/imex/imex-meta/imex-meta.service.ts | 4 +- .../imex/local-backup/local-backup.module.ts | 6 +- .../imex/local-backup/local-backup.service.ts | 16 +- .../dialog-migrate.component.ts | 4 +- src/app/imex/migrate/migrate.module.ts | 8 +- src/app/imex/migrate/migrate.service.ts | 50 +- src/app/imex/sync/sync.model.ts | 3 +- src/app/imex/sync/sync.module.ts | 2 +- src/app/imex/sync/sync.service.spec.ts | 24 +- .../config-page/config-page.component.ts | 7 +- .../pages/config-page/config-page.module.ts | 14 +- .../daily-summary/daily-summary.module.ts | 5 +- .../metric-page/metric-page.component.spec.ts | 8 +- .../pages/metric-page/metric-page.module.ts | 9 +- src/app/pages/pages.module.ts | 14 +- .../project-page/project-page.component.ts | 2 +- .../pages/project-page/project-page.module.ts | 10 +- .../backlog-tabs/backlog-tabs.component.html | 3 +- .../pages/work-view/split/split.component.ts | 8 +- .../work-view/split/split.module.spec.ts | 2 +- src/app/pages/work-view/split/split.module.ts | 10 +- .../work-view/work-view-page.component.scss | 1 + .../pages/work-view/work-view-page.module.ts | 20 +- .../calendar/calendar.component.ts | 2 +- .../calendar/calendar.module.ts | 6 +- .../worklog-and-calendar.component.ts | 2 +- .../worklog-and-calendar.module.ts | 14 +- src/app/root-store/index.ts | 2 +- src/app/root-store/root-store.module.ts | 2 +- src/app/ui/animations/blend-in-out.ani.ts | 4 +- src/app/ui/animations/dynamic-height.ani.ts | 14 +- src/app/ui/animations/expand.ani.ts | 4 +- src/app/ui/animations/fade.ani.ts | 4 +- src/app/ui/animations/noop.ani.ts | 2 +- src/app/ui/animations/slide.ani.ts | 4 +- src/app/ui/animations/standard-list.ani.ts | 4 +- src/app/ui/animations/swirl-in-out.ani.ts | 4 +- src/app/ui/animations/warp-route.ts | 4 +- .../chip-list-input.component.spec.ts | 8 +- .../chip-list-input.component.ts | 8 +- .../ui/collapsible/collapsible.component.ts | 4 +- .../dialog-confirm.component.ts | 4 +- .../ui/duration/duration-from-string.pipe.ts | 2 +- .../ui/duration/duration-to-string.pipe.ts | 2 +- .../input-duration-formly.component.ts | 8 +- .../duration/input-duration-slider/dot.ani.ts | 4 +- .../input-duration-slider.component.ts | 4 +- .../ui/duration/input-duration.directive.ts | 16 +- .../ui/duration/ms-to-clock-string.pipe.ts | 2 +- .../ms-to-minute-clock-string.pipe.ts | 2 +- src/app/ui/duration/ms-to-string$.pipe.ts | 8 +- src/app/ui/duration/ms-to-string.pipe.ts | 2 +- src/app/ui/duration/string-to-ms.pipe.ts | 2 +- .../edit-on-click/edit-on-click.directive.ts | 2 +- .../ui/enlarge-img/enlarge-img.directive.ts | 4 +- .../full-page-spinner.component.spec.ts | 8 +- .../full-page-spinner.component.ts | 2 +- .../ui/help-section/help-section.component.ts | 4 +- .../inline-input.component.spec.ts | 8 +- .../ui/inline-input/inline-input.component.ts | 4 +- .../inline-markdown.component.ts | 14 +- .../ui/pipes/humanize-timestamp.pipe.spec.ts | 2 +- src/app/ui/pipes/humanize-timestamp.pipe.ts | 2 +- src/app/ui/pipes/keys.pipe.spec.ts | 2 +- src/app/ui/pipes/keys.pipe.ts | 2 +- src/app/ui/pipes/moment-format.pipe.spec.ts | 2 +- src/app/ui/pipes/moment-format.pipe.ts | 2 +- src/app/ui/pipes/number-to-month.pipe.ts | 2 +- src/app/ui/pipes/to-array.pipe.spec.ts | 2 +- src/app/ui/pipes/to-array.pipe.ts | 2 +- .../ui/progress-bar/progress-bar.component.ts | 2 +- .../simple-download.directive.ts | 2 +- .../ui/theme-select/theme-select.component.ts | 5 +- src/app/ui/ui.module.ts | 50 +- src/app/util/get-weeks-in-month.spec.ts | 2 +- src/app/util/get-work-log-str.ts | 2 +- src/app/util/round-time.ts | 4 +- src/assets/fonts/MaterialIcons-Regular.svg | 3928 ++++++++--------- src/assets/icons/drag-handle.svg | 14 +- src/assets/icons/github.svg | 6 +- src/assets/icons/jira.svg | 76 +- src/assets/icons/play.svg | 4 +- src/assets/icons/sp.svg | 6 +- src/assets/web-workers/reminder.js | 2 +- src/environments/environment.prod.ts | 3 +- src/environments/environment.ts | 2 +- src/hammer-config.class.ts | 2 +- src/index.html | 3 +- src/karma.conf.js | 4 +- src/main.ts | 10 +- src/test.ts | 4 +- 271 files changed, 3313 insertions(+), 3271 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8fab7a51cb..0fcc02b8ca 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -18,7 +18,7 @@ import {FormlyMaterialModule} from '@ngx-formly/material'; import {PagesModule} from './pages/pages.module'; import {MainHeaderModule} from './core-ui/main-header/main-header.module'; import {HttpClientModule} from '@angular/common/http'; -import { MatSidenavModule } from '@angular/material/sidenav'; +import {MatSidenavModule} from '@angular/material/sidenav'; import {TasksModule} from './features/tasks/tasks.module'; import {TimeTrackingModule} from './features/time-tracking/time-tracking.module'; import {BookmarkModule} from './features/bookmark/bookmark.module'; diff --git a/src/app/core-ui/core-ui.module.ts b/src/app/core-ui/core-ui.module.ts index 7ae6e5a6ca..60d5e56473 100644 --- a/src/app/core-ui/core-ui.module.ts +++ b/src/app/core-ui/core-ui.module.ts @@ -1,8 +1,8 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { LayoutModule } from './layout/layout.module'; -import { MainHeaderModule } from './main-header/main-header.module'; -import { ShortcutModule } from './shortcut/shortcut.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {LayoutModule} from './layout/layout.module'; +import {MainHeaderModule} from './main-header/main-header.module'; +import {ShortcutModule} from './shortcut/shortcut.module'; @NgModule({ declarations: [], diff --git a/src/app/core-ui/layout/layout.module.ts b/src/app/core-ui/layout/layout.module.ts index 9c82d4ce6a..87344320e1 100644 --- a/src/app/core-ui/layout/layout.module.ts +++ b/src/app/core-ui/layout/layout.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StoreModule } from '@ngrx/store'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {StoreModule} from '@ngrx/store'; import * as fromLayout from './store/layout.reducer'; -import { LAYOUT_FEATURE_NAME } from './store/layout.reducer'; -import { EffectsModule } from '@ngrx/effects'; -import { LayoutEffects } from './store/layout.effects'; +import {LAYOUT_FEATURE_NAME} from './store/layout.reducer'; +import {EffectsModule} from '@ngrx/effects'; +import {LayoutEffects} from './store/layout.effects'; @NgModule({ imports: [ diff --git a/src/app/core-ui/layout/layout.service.ts b/src/app/core-ui/layout/layout.service.ts index e0d3718d9e..512016ef06 100644 --- a/src/app/core-ui/layout/layout.service.ts +++ b/src/app/core-ui/layout/layout.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; import { HideAddTaskBar, HideBookmarkBar, @@ -7,9 +7,9 @@ import { ToggleAddTaskBar, ToggleBookmarkBar } from './store/layout.actions'; -import { Observable } from 'rxjs'; -import { select, Store } from '@ngrx/store'; -import { LayoutState, selectIsShowAddTaskBar, selectIsShowBookmarkBar } from './store/layout.reducer'; +import {Observable} from 'rxjs'; +import {select, Store} from '@ngrx/store'; +import {LayoutState, selectIsShowAddTaskBar, selectIsShowBookmarkBar} from './store/layout.reducer'; @Injectable({ providedIn: 'root', diff --git a/src/app/core-ui/layout/store/layout.actions.ts b/src/app/core-ui/layout/store/layout.actions.ts index 8183c0bc5c..798751c6d6 100644 --- a/src/app/core-ui/layout/store/layout.actions.ts +++ b/src/app/core-ui/layout/store/layout.actions.ts @@ -1,4 +1,4 @@ -import { Action } from '@ngrx/store'; +import {Action} from '@ngrx/store'; export enum LayoutActionTypes { ShowAddTaskBar = '[Layout] Show AddTaskBar', diff --git a/src/app/core-ui/layout/store/layout.effects.ts b/src/app/core-ui/layout/store/layout.effects.ts index 0d14e41752..f2de944dc1 100644 --- a/src/app/core-ui/layout/store/layout.effects.ts +++ b/src/app/core-ui/layout/store/layout.effects.ts @@ -1,8 +1,8 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { LayoutActionTypes } from './layout.actions'; -import { map } from 'rxjs/operators'; -import { FocusLastActiveTask } from '../../../features/tasks/store/task.actions'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {LayoutActionTypes} from './layout.actions'; +import {map} from 'rxjs/operators'; +import {FocusLastActiveTask} from '../../../features/tasks/store/task.actions'; @Injectable() export class LayoutEffects { diff --git a/src/app/core-ui/layout/store/layout.reducer.ts b/src/app/core-ui/layout/store/layout.reducer.ts index d3462faf0e..100f9f8cde 100644 --- a/src/app/core-ui/layout/store/layout.reducer.ts +++ b/src/app/core-ui/layout/store/layout.reducer.ts @@ -1,5 +1,5 @@ -import { LayoutActions, LayoutActionTypes } from './layout.actions'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; +import {LayoutActions, LayoutActionTypes} from './layout.actions'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; export const LAYOUT_FEATURE_NAME = 'layout'; diff --git a/src/app/core-ui/main-header/main-header.component.ts b/src/app/core-ui/main-header/main-header.component.ts index 7c95fe3718..650fd910e6 100644 --- a/src/app/core-ui/main-header/main-header.component.ts +++ b/src/app/core-ui/main-header/main-header.component.ts @@ -1,15 +1,15 @@ -import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, Renderer2, ViewChild } from '@angular/core'; -import { ProjectService } from '../../features/project/project.service'; -import { DialogCreateProjectComponent } from '../../features/project/dialogs/create-project/dialog-create-project.component'; -import { MatDialog } from '@angular/material/dialog'; -import { MatDrawer } from '@angular/material/sidenav'; -import { LayoutService } from '../layout/layout.service'; -import { BookmarkService } from '../../features/bookmark/bookmark.service'; -import { NoteService } from '../../features/note/note.service'; -import { TaskService } from '../../features/tasks/task.service'; -import { GlobalConfigService } from '../../features/config/global-config.service'; -import { PomodoroService } from '../../features/pomodoro/pomodoro.service'; -import { Project } from '../../features/project/project.model'; +import {ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, Renderer2, ViewChild} from '@angular/core'; +import {ProjectService} from '../../features/project/project.service'; +import {DialogCreateProjectComponent} from '../../features/project/dialogs/create-project/dialog-create-project.component'; +import {MatDialog} from '@angular/material/dialog'; +import {MatDrawer} from '@angular/material/sidenav'; +import {LayoutService} from '../layout/layout.service'; +import {BookmarkService} from '../../features/bookmark/bookmark.service'; +import {NoteService} from '../../features/note/note.service'; +import {TaskService} from '../../features/tasks/task.service'; +import {GlobalConfigService} from '../../features/config/global-config.service'; +import {PomodoroService} from '../../features/pomodoro/pomodoro.service'; +import {Project} from '../../features/project/project.model'; @Component({ selector: 'main-header', @@ -22,7 +22,7 @@ export class MainHeaderComponent implements OnInit { circumference = this.progressCircleRadius * Math.PI * 2; @Input() drawer: MatDrawer; - @ViewChild('circleSvg', { static: true }) circleSvg: ElementRef; + @ViewChild('circleSvg', {static: true}) circleSvg: ElementRef; constructor( public readonly projectService: ProjectService, diff --git a/src/app/core-ui/main-header/main-header.module.ts b/src/app/core-ui/main-header/main-header.module.ts index c20bd2398d..2ee929d10e 100644 --- a/src/app/core-ui/main-header/main-header.module.ts +++ b/src/app/core-ui/main-header/main-header.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MainHeaderComponent } from './main-header.component'; -import { UiModule } from '../../ui/ui.module'; -import { ProjectModule } from '../../features/project/project.module'; -import { RouterModule } from '@angular/router'; -import { BookmarkModule } from '../../features/bookmark/bookmark.module'; -import { PomodoroModule } from '../../features/pomodoro/pomodoro.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {MainHeaderComponent} from './main-header.component'; +import {UiModule} from '../../ui/ui.module'; +import {ProjectModule} from '../../features/project/project.module'; +import {RouterModule} from '@angular/router'; +import {BookmarkModule} from '../../features/bookmark/bookmark.module'; +import {PomodoroModule} from '../../features/pomodoro/pomodoro.module'; @NgModule({ imports: [ diff --git a/src/app/core-ui/shortcut/shortcut.module.ts b/src/app/core-ui/shortcut/shortcut.module.ts index e74fce8c3c..b002fe5a42 100644 --- a/src/app/core-ui/shortcut/shortcut.module.ts +++ b/src/app/core-ui/shortcut/shortcut.module.ts @@ -1,6 +1,6 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {RouterModule} from '@angular/router'; @NgModule({ imports: [ diff --git a/src/app/core-ui/shortcut/shortcut.service.ts b/src/app/core-ui/shortcut/shortcut.service.ts index 0f9ecd516c..c65504eb82 100644 --- a/src/app/core-ui/shortcut/shortcut.service.ts +++ b/src/app/core-ui/shortcut/shortcut.service.ts @@ -1,16 +1,16 @@ -import { Injectable } from '@angular/core'; -import { IS_ELECTRON } from '../../app.constants'; -import { checkKeyCombo } from '../../util/check-key-combo'; -import { GlobalConfigService } from '../../features/config/global-config.service'; -import { ActivatedRoute, Router } from '@angular/router'; -import { ElectronService } from 'ngx-electron'; -import { LayoutService } from '../layout/layout.service'; -import { NoteService } from '../../features/note/note.service'; -import { TaskService } from '../../features/tasks/task.service'; -import { MatDialog } from '@angular/material/dialog'; -import { DialogAddNoteComponent } from '../../features/note/dialog-add-note/dialog-add-note.component'; -import { BookmarkService } from '../../features/bookmark/bookmark.service'; -import { IPC_TASK_TOGGLE_START } from '../../../../electron/ipc-events.const'; +import {Injectable} from '@angular/core'; +import {IS_ELECTRON} from '../../app.constants'; +import {checkKeyCombo} from '../../util/check-key-combo'; +import {GlobalConfigService} from '../../features/config/global-config.service'; +import {ActivatedRoute, Router} from '@angular/router'; +import {ElectronService} from 'ngx-electron'; +import {LayoutService} from '../layout/layout.service'; +import {NoteService} from '../../features/note/note.service'; +import {TaskService} from '../../features/tasks/task.service'; +import {MatDialog} from '@angular/material/dialog'; +import {DialogAddNoteComponent} from '../../features/note/dialog-add-note/dialog-add-note.component'; +import {BookmarkService} from '../../features/bookmark/bookmark.service'; +import {IPC_TASK_TOGGLE_START} from '../../../../electron/ipc-events.const'; @Injectable({ diff --git a/src/app/core/banner/banner.module.ts b/src/app/core/banner/banner.module.ts index 0cc6301ebb..b40f64d72e 100644 --- a/src/app/core/banner/banner.module.ts +++ b/src/app/core/banner/banner.module.ts @@ -1,7 +1,7 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { BannerComponent } from './banner/banner.component'; -import { UiModule } from '../../ui/ui.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {BannerComponent} from './banner/banner.component'; +import {UiModule} from '../../ui/ui.module'; @NgModule({ declarations: [ diff --git a/src/app/core/banner/banner.service.spec.ts b/src/app/core/banner/banner.service.spec.ts index 02a279afc0..0a9325534d 100644 --- a/src/app/core/banner/banner.service.spec.ts +++ b/src/app/core/banner/banner.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { BannerService } from './banner.service'; +import {BannerService} from './banner.service'; describe('BannerService', () => { beforeEach(() => TestBed.configureTestingModule({})); diff --git a/src/app/core/banner/banner/banner.component.ts b/src/app/core/banner/banner/banner.component.ts index 08f58ab34c..096b2233df 100644 --- a/src/app/core/banner/banner/banner.component.ts +++ b/src/app/core/banner/banner/banner.component.ts @@ -1,9 +1,9 @@ -import { ChangeDetectionStrategy, Component, ElementRef, ViewChild } from '@angular/core'; -import { BannerService } from '../banner.service'; -import { Banner, BannerAction } from '../banner.model'; -import { concatMap, mapTo } from 'rxjs/operators'; -import { merge, Observable, of, timer } from 'rxjs'; -import { slideAnimation } from '../../../ui/animations/slide.ani'; +import {ChangeDetectionStrategy, Component, ElementRef, ViewChild} from '@angular/core'; +import {BannerService} from '../banner.service'; +import {Banner, BannerAction} from '../banner.model'; +import {concatMap, mapTo} from 'rxjs/operators'; +import {merge, Observable, of, timer} from 'rxjs'; +import {slideAnimation} from '../../../ui/animations/slide.ani'; @Component({ selector: 'banner', @@ -37,7 +37,7 @@ export class BannerComponent { private _dirtyReference: string; - @ViewChild('wrapperEl', { static: false }) set wrapperEl(content: ElementRef) { + @ViewChild('wrapperEl', {static: false}) set wrapperEl(content: ElementRef) { if (content && content.nativeElement) { this.height = content.nativeElement.offsetHeight; } diff --git a/src/app/core/chrome-extension-interface/chrome-extension-interface.module.ts b/src/app/core/chrome-extension-interface/chrome-extension-interface.module.ts index 2dfed39a79..f9446b1bdc 100644 --- a/src/app/core/chrome-extension-interface/chrome-extension-interface.module.ts +++ b/src/app/core/chrome-extension-interface/chrome-extension-interface.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; @NgModule({ imports: [ diff --git a/src/app/core/chrome-extension-interface/chrome-extension-interface.service.ts b/src/app/core/chrome-extension-interface/chrome-extension-interface.service.ts index c0fc040df0..b61d54928f 100644 --- a/src/app/core/chrome-extension-interface/chrome-extension-interface.service.ts +++ b/src/app/core/chrome-extension-interface/chrome-extension-interface.service.ts @@ -1,7 +1,7 @@ -import { Injectable } from '@angular/core'; -import { ExtensionInterfaceEventName } from './chrome-extension-interface'; -import { ReplaySubject } from 'rxjs'; -import { first, startWith } from 'rxjs/operators'; +import {Injectable} from '@angular/core'; +import {ExtensionInterfaceEventName} from './chrome-extension-interface'; +import {ReplaySubject} from 'rxjs'; +import {first, startWith} from 'rxjs/operators'; const interfaceEl = window; diff --git a/src/app/core/compression/compression.module.ts b/src/app/core/compression/compression.module.ts index 276f9b3e9b..46dcd6602d 100644 --- a/src/app/core/compression/compression.module.ts +++ b/src/app/core/compression/compression.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; @NgModule({ declarations: [], @@ -7,4 +7,5 @@ import { CommonModule } from '@angular/common'; CommonModule ] }) -export class CompressionModule { } +export class CompressionModule { +} diff --git a/src/app/core/compression/compression.service.spec.ts b/src/app/core/compression/compression.service.spec.ts index aded42203a..05275232fd 100644 --- a/src/app/core/compression/compression.service.spec.ts +++ b/src/app/core/compression/compression.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { CompressionService } from './compression.service'; +import {CompressionService} from './compression.service'; describe('CompressionService', () => { beforeEach(() => TestBed.configureTestingModule({})); diff --git a/src/app/core/core.module.spec.ts b/src/app/core/core.module.spec.ts index d8fcf7e3d5..31bbdb87d9 100644 --- a/src/app/core/core.module.spec.ts +++ b/src/app/core/core.module.spec.ts @@ -1,4 +1,4 @@ -import { CoreModule } from './core.module'; +import {CoreModule} from './core.module'; describe('CoreModule', () => { let coreModule: CoreModule; diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 5f1d279c6a..dc68023800 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -1,12 +1,12 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { PersistenceModule } from './persistence/persistence.module'; -import { ChromeExtensionInterfaceModule } from './chrome-extension-interface/chrome-extension-interface.module'; -import { SnackModule } from './snack/snack.module'; -import { RouterModule } from '@angular/router'; -import { NotifyModule } from './notify/notify.module'; -import { LocalBackupModule } from '../imex/local-backup/local-backup.module'; -import { BannerModule } from './banner/banner.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {PersistenceModule} from './persistence/persistence.module'; +import {ChromeExtensionInterfaceModule} from './chrome-extension-interface/chrome-extension-interface.module'; +import {SnackModule} from './snack/snack.module'; +import {RouterModule} from '@angular/router'; +import {NotifyModule} from './notify/notify.module'; +import {LocalBackupModule} from '../imex/local-backup/local-backup.module'; +import {BannerModule} from './banner/banner.module'; import {CompressionModule} from './compression/compression.module'; @NgModule({ diff --git a/src/app/core/drop-paste-input/drop-paste-input.ts b/src/app/core/drop-paste-input/drop-paste-input.ts index b82ce80208..523d107d3d 100644 --- a/src/app/core/drop-paste-input/drop-paste-input.ts +++ b/src/app/core/drop-paste-input/drop-paste-input.ts @@ -1,4 +1,4 @@ -import { isImageUrlSimple } from '../../util/is-image-url'; +import {isImageUrlSimple} from '../../util/is-image-url'; export type DropPasteInputType = 'FILE' | 'LINK' | 'IMG' | 'COMMAND' | 'NOTE'; diff --git a/src/app/core/notify/notify.module.ts b/src/app/core/notify/notify.module.ts index 413257fc8d..7a17411b37 100644 --- a/src/app/core/notify/notify.module.ts +++ b/src/app/core/notify/notify.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; @NgModule({ imports: [ diff --git a/src/app/core/persistence/database.service.ts b/src/app/core/persistence/database.service.ts index 3475264eba..56d57d0a67 100644 --- a/src/app/core/persistence/database.service.ts +++ b/src/app/core/persistence/database.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; import * as localForage from 'localforage'; -import { SnackService } from '../snack/snack.service'; +import {SnackService} from '../snack/snack.service'; @Injectable({ providedIn: 'root', diff --git a/src/app/core/persistence/local-storage.ts b/src/app/core/persistence/local-storage.ts index 32f3b820dd..f9113a0b83 100644 --- a/src/app/core/persistence/local-storage.ts +++ b/src/app/core/persistence/local-storage.ts @@ -1,4 +1,4 @@ -import { LS_LAST_ACTIVE } from './ls-keys.const'; +import {LS_LAST_ACTIVE} from './ls-keys.const'; export const loadFromLs = (key) => { const serializedState = localStorage.getItem(key); diff --git a/src/app/core/persistence/persistence.module.ts b/src/app/core/persistence/persistence.module.ts index ae99c8707f..5d9deda90d 100644 --- a/src/app/core/persistence/persistence.module.ts +++ b/src/app/core/persistence/persistence.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; @NgModule({ imports: [ diff --git a/src/app/core/snack/snack-custom/snack-custom.component.ts b/src/app/core/snack/snack-custom/snack-custom.component.ts index 019a08c56f..43ff18fec5 100644 --- a/src/app/core/snack/snack-custom/snack-custom.component.ts +++ b/src/app/core/snack/snack-custom/snack-custom.component.ts @@ -1,8 +1,8 @@ -import { ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar'; -import { SnackParams } from '../snack.model'; -import { Subscription } from 'rxjs'; -import { debounceTime, delay } from 'rxjs/operators'; +import {ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit} from '@angular/core'; +import {MAT_SNACK_BAR_DATA, MatSnackBarRef} from '@angular/material/snack-bar'; +import {SnackParams} from '../snack.model'; +import {Subscription} from 'rxjs'; +import {debounceTime} from 'rxjs/operators'; @Component({ selector: 'snack-custom', @@ -49,7 +49,7 @@ export class SnackCustomComponent implements OnInit, OnDestroy { this.snackBarRef.dismissWithAction(); } - close(){ + close() { this.snackBarRef.dismissWithAction(); } } diff --git a/src/app/core/snack/snack.model.ts b/src/app/core/snack/snack.model.ts index afb271b682..910cb20b08 100644 --- a/src/app/core/snack/snack.model.ts +++ b/src/app/core/snack/snack.model.ts @@ -1,7 +1,7 @@ -import { MatSnackBarConfig } from '@angular/material/snack-bar'; -import { Observable } from 'rxjs'; +import {MatSnackBarConfig} from '@angular/material/snack-bar'; +import {Observable} from 'rxjs'; -export type SnackType = 'ERROR' | 'SUCCESS' | 'CUSTOM' | 'JIRA_UNBLOCK'; +export type SnackType = 'ERROR' | 'SUCCESS' | 'CUSTOM' | 'JIRA_UNBLOCK'; export interface SnackParams { msg: string; diff --git a/src/app/core/snack/snack.module.ts b/src/app/core/snack/snack.module.ts index b7b0fe11a3..7ee1411e95 100644 --- a/src/app/core/snack/snack.module.ts +++ b/src/app/core/snack/snack.module.ts @@ -1,13 +1,13 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StoreModule } from '@ngrx/store'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {StoreModule} from '@ngrx/store'; import * as fromSnack from './store/snack.reducer'; -import { SNACK_FEATURE_NAME } from './store/snack.reducer'; -import { EffectsModule } from '@ngrx/effects'; -import { SnackEffects } from './store/snack.effects'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { SnackCustomComponent } from './snack-custom/snack-custom.component'; -import { UiModule } from '../../ui/ui.module'; +import {SNACK_FEATURE_NAME} from './store/snack.reducer'; +import {EffectsModule} from '@ngrx/effects'; +import {SnackEffects} from './store/snack.effects'; +import {MatSnackBarModule} from '@angular/material/snack-bar'; +import {SnackCustomComponent} from './snack-custom/snack-custom.component'; +import {UiModule} from '../../ui/ui.module'; @NgModule({ imports: [ diff --git a/src/app/core/snack/snack.service.ts b/src/app/core/snack/snack.service.ts index f199a966b0..2f1412aba8 100644 --- a/src/app/core/snack/snack.service.ts +++ b/src/app/core/snack/snack.service.ts @@ -1,7 +1,7 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { SnackClose, SnackOpen } from './store/snack.actions'; -import { SnackParams } from './snack.model'; +import {Injectable} from '@angular/core'; +import {Store} from '@ngrx/store'; +import {SnackClose, SnackOpen} from './store/snack.actions'; +import {SnackParams} from './snack.model'; @Injectable({ providedIn: 'root', diff --git a/src/app/core/snack/store/snack.actions.ts b/src/app/core/snack/store/snack.actions.ts index 0680cf309d..7b12fb424d 100644 --- a/src/app/core/snack/store/snack.actions.ts +++ b/src/app/core/snack/store/snack.actions.ts @@ -1,5 +1,5 @@ -import { Action } from '@ngrx/store'; -import { SnackParams } from '../snack.model'; +import {Action} from '@ngrx/store'; +import {SnackParams} from '../snack.model'; export enum SnackActionTypes { SnackOpen = '[Snack] SnackOpen', diff --git a/src/app/core/snack/store/snack.effects.ts b/src/app/core/snack/store/snack.effects.ts index 2a5bffbc9c..8635164717 100644 --- a/src/app/core/snack/store/snack.effects.ts +++ b/src/app/core/snack/store/snack.effects.ts @@ -1,12 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { SnackActionTypes, SnackOpen } from './snack.actions'; -import { Observable, Subject } from 'rxjs'; -import { takeUntil, tap } from 'rxjs/operators'; -import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; -import { Store } from '@ngrx/store'; -import { SnackCustomComponent } from '../snack-custom/snack-custom.component'; -import { DEFAULT_SNACK_CFG } from '../snack.const'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {SnackActionTypes, SnackOpen} from './snack.actions'; +import {Observable, Subject} from 'rxjs'; +import {takeUntil, tap} from 'rxjs/operators'; +import {MatSnackBar, MatSnackBarRef, SimpleSnackBar} from '@angular/material/snack-bar'; +import {Store} from '@ngrx/store'; +import {SnackCustomComponent} from '../snack-custom/snack-custom.component'; +import {DEFAULT_SNACK_CFG} from '../snack.const'; @Injectable() export class SnackEffects { diff --git a/src/app/core/snack/store/snack.reducer.ts b/src/app/core/snack/store/snack.reducer.ts index 74fce88727..3e84742f02 100644 --- a/src/app/core/snack/store/snack.reducer.ts +++ b/src/app/core/snack/store/snack.reducer.ts @@ -1,4 +1,4 @@ -import { SnackActions, SnackActionTypes } from './snack.actions'; +import {SnackActions, SnackActionTypes} from './snack.actions'; export const SNACK_FEATURE_NAME = 'snack'; diff --git a/src/app/features/attachment/attachment-link/attachment-link.directive.ts b/src/app/features/attachment/attachment-link/attachment-link.directive.ts index b5c7c038f4..1d3bf14a9e 100644 --- a/src/app/features/attachment/attachment-link/attachment-link.directive.ts +++ b/src/app/features/attachment/attachment-link/attachment-link.directive.ts @@ -1,9 +1,9 @@ -import { Directive, HostListener, Input } from '@angular/core'; -import { IS_ELECTRON } from '../../../app.constants'; -import { AttachmentType } from '../attachment.model'; -import { ElectronService } from 'ngx-electron'; -import { SnackService } from '../../../core/snack/snack.service'; -import { IPC_EXEC } from '../../../../../electron/ipc-events.const'; +import {Directive, HostListener, Input} from '@angular/core'; +import {IS_ELECTRON} from '../../../app.constants'; +import {AttachmentType} from '../attachment.model'; +import {ElectronService} from 'ngx-electron'; +import {SnackService} from '../../../core/snack/snack.service'; +import {IPC_EXEC} from '../../../../../electron/ipc-events.const'; @Directive({ diff --git a/src/app/features/attachment/attachment-list/attachment-list.component.ts b/src/app/features/attachment/attachment-list/attachment-list.component.ts index 36d6a9a535..27ded8d1a8 100644 --- a/src/app/features/attachment/attachment-list/attachment-list.component.ts +++ b/src/app/features/attachment/attachment-list/attachment-list.component.ts @@ -1,9 +1,9 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { Attachment } from '../attachment.model'; -import { AttachmentService } from '../attachment.service'; -import { MatDialog } from '@angular/material/dialog'; -import { DialogEditAttachmentComponent } from '../dialog-edit-attachment/dialog-edit-attachment.component'; -import { standardListAnimation } from '../../../ui/animations/standard-list.ani'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {Attachment} from '../attachment.model'; +import {AttachmentService} from '../attachment.service'; +import {MatDialog} from '@angular/material/dialog'; +import {DialogEditAttachmentComponent} from '../dialog-edit-attachment/dialog-edit-attachment.component'; +import {standardListAnimation} from '../../../ui/animations/standard-list.ani'; @Component({ selector: 'attachment-list', diff --git a/src/app/features/attachment/attachment.model.ts b/src/app/features/attachment/attachment.model.ts index 573c067cf7..8450140e0f 100644 --- a/src/app/features/attachment/attachment.model.ts +++ b/src/app/features/attachment/attachment.model.ts @@ -1,4 +1,4 @@ -import { DropPasteInput, DropPasteInputType } from '../../core/drop-paste-input/drop-paste-input'; +import {DropPasteInput, DropPasteInputType} from '../../core/drop-paste-input/drop-paste-input'; export type AttachmentType = DropPasteInputType; diff --git a/src/app/features/attachment/attachment.module.ts b/src/app/features/attachment/attachment.module.ts index de0d231bbc..42a13f4f14 100644 --- a/src/app/features/attachment/attachment.module.ts +++ b/src/app/features/attachment/attachment.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; -import { AttachmentEffects } from './store/attachment.effects'; -import { UiModule } from '../../ui/ui.module'; -import { ATTACHMENT_FEATURE_NAME, attachmentReducer } from './store/attachment.reducer'; -import { DialogEditAttachmentComponent } from './dialog-edit-attachment/dialog-edit-attachment.component'; -import { FormsModule } from '@angular/forms'; -import { AttachmentLinkDirective } from './attachment-link/attachment-link.directive'; -import { AttachmentListComponent } from './attachment-list/attachment-list.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {StoreModule} from '@ngrx/store'; +import {EffectsModule} from '@ngrx/effects'; +import {AttachmentEffects} from './store/attachment.effects'; +import {UiModule} from '../../ui/ui.module'; +import {ATTACHMENT_FEATURE_NAME, attachmentReducer} from './store/attachment.reducer'; +import {DialogEditAttachmentComponent} from './dialog-edit-attachment/dialog-edit-attachment.component'; +import {FormsModule} from '@angular/forms'; +import {AttachmentLinkDirective} from './attachment-link/attachment-link.directive'; +import {AttachmentListComponent} from './attachment-list/attachment-list.component'; @NgModule({ imports: [ diff --git a/src/app/features/attachment/attachment.service.ts b/src/app/features/attachment/attachment.service.ts index 7b371bacd4..405ed9bf84 100644 --- a/src/app/features/attachment/attachment.service.ts +++ b/src/app/features/attachment/attachment.service.ts @@ -1,15 +1,25 @@ -import { Injectable } from '@angular/core'; -import { select, Store } from '@ngrx/store'; -import { AttachmentState, initialAttachmentState, selectAllAttachments, selectAttachmentByIds } from './store/attachment.reducer'; -import { AddAttachment, DeleteAttachment, DeleteAttachments, LoadAttachmentState, UpdateAttachment } from './store/attachment.actions'; -import { Observable } from 'rxjs'; -import { Attachment } from './attachment.model'; +import {Injectable} from '@angular/core'; +import {select, Store} from '@ngrx/store'; +import { + AttachmentState, + initialAttachmentState, + selectAllAttachments, + selectAttachmentByIds +} from './store/attachment.reducer'; +import { + AddAttachment, + DeleteAttachment, + DeleteAttachments, + LoadAttachmentState, + UpdateAttachment +} from './store/attachment.actions'; +import {Observable} from 'rxjs'; +import {Attachment} from './attachment.model'; import shortid from 'shortid'; -import { DialogEditAttachmentComponent } from './dialog-edit-attachment/dialog-edit-attachment.component'; -import { MatDialog } from '@angular/material/dialog'; -import { createFromDrop, createFromPaste, DropPasteInput } from '../../core/drop-paste-input/drop-paste-input'; -import { PersistenceService } from '../../core/persistence/persistence.service'; -import { take } from 'rxjs/operators'; +import {DialogEditAttachmentComponent} from './dialog-edit-attachment/dialog-edit-attachment.component'; +import {MatDialog} from '@angular/material/dialog'; +import {createFromDrop, createFromPaste, DropPasteInput} from '../../core/drop-paste-input/drop-paste-input'; +import {PersistenceService} from '../../core/persistence/persistence.service'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/attachment/dialog-edit-attachment/dialog-edit-attachment.component.ts b/src/app/features/attachment/dialog-edit-attachment/dialog-edit-attachment.component.ts index 04c35847b8..0a0ba8f476 100644 --- a/src/app/features/attachment/dialog-edit-attachment/dialog-edit-attachment.component.ts +++ b/src/app/features/attachment/dialog-edit-attachment/dialog-edit-attachment.component.ts @@ -1,7 +1,7 @@ -import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { IS_ELECTRON } from '../../../app.constants'; -import { AttachmentCopy, AttachmentType } from '../attachment.model'; +import {ChangeDetectionStrategy, Component, Inject, OnInit} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {IS_ELECTRON} from '../../../app.constants'; +import {AttachmentCopy, AttachmentType} from '../attachment.model'; interface AttachmentSelectType { type: AttachmentType; diff --git a/src/app/features/attachment/store/attachment.actions.ts b/src/app/features/attachment/store/attachment.actions.ts index b775d8f543..311d16beca 100644 --- a/src/app/features/attachment/store/attachment.actions.ts +++ b/src/app/features/attachment/store/attachment.actions.ts @@ -1,7 +1,7 @@ -import { Action } from '@ngrx/store'; -import { Update } from '@ngrx/entity'; -import { Attachment } from '../attachment.model'; -import { AttachmentState } from './attachment.reducer'; +import {Action} from '@ngrx/store'; +import {Update} from '@ngrx/entity'; +import {Attachment} from '../attachment.model'; +import {AttachmentState} from './attachment.reducer'; export enum AttachmentActionTypes { LoadAttachmentState = '[Attachment] Load Attachment State', diff --git a/src/app/features/attachment/store/attachment.effects.ts b/src/app/features/attachment/store/attachment.effects.ts index dd2cb6eac3..174f70a21e 100644 --- a/src/app/features/attachment/store/attachment.effects.ts +++ b/src/app/features/attachment/store/attachment.effects.ts @@ -1,12 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { tap, withLatestFrom } from 'rxjs/operators'; -import { select, Store } from '@ngrx/store'; -import { selectCurrentProjectId } from '../../project/store/project.reducer'; -import { AttachmentActionTypes } from './attachment.actions'; -import { selectAttachmentFeatureState } from './attachment.reducer'; -import { PersistenceService } from '../../../core/persistence/persistence.service'; -import { TaskActionTypes } from '../../tasks/store/task.actions'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {tap, withLatestFrom} from 'rxjs/operators'; +import {select, Store} from '@ngrx/store'; +import {selectCurrentProjectId} from '../../project/store/project.reducer'; +import {AttachmentActionTypes} from './attachment.actions'; +import {selectAttachmentFeatureState} from './attachment.reducer'; +import {PersistenceService} from '../../../core/persistence/persistence.service'; +import {TaskActionTypes} from '../../tasks/store/task.actions'; @Injectable() export class AttachmentEffects { diff --git a/src/app/features/attachment/store/attachment.reducer.ts b/src/app/features/attachment/store/attachment.reducer.ts index c08f5ec0f4..214c67055b 100644 --- a/src/app/features/attachment/store/attachment.reducer.ts +++ b/src/app/features/attachment/store/attachment.reducer.ts @@ -1,8 +1,8 @@ -import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity'; -import { AttachmentActions, AttachmentActionTypes } from './attachment.actions'; -import { Attachment } from '../attachment.model'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; -import { DeleteTask, TaskActionTypes, UndoDeleteTask } from '../../tasks/store/task.actions'; +import {createEntityAdapter, EntityAdapter, EntityState} from '@ngrx/entity'; +import {AttachmentActions, AttachmentActionTypes} from './attachment.actions'; +import {Attachment} from '../attachment.model'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; +import {DeleteTask, TaskActionTypes, UndoDeleteTask} from '../../tasks/store/task.actions'; export const ATTACHMENT_FEATURE_NAME = 'attachment'; diff --git a/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts b/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts index ad0df90931..0f7efd66dc 100644 --- a/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts +++ b/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts @@ -1,12 +1,12 @@ -import { ChangeDetectionStrategy, Component, ElementRef, HostListener, OnDestroy, ViewChild } from '@angular/core'; -import { BookmarkService } from '../bookmark.service'; -import { MatDialog } from '@angular/material/dialog'; -import { DialogEditBookmarkComponent } from '../dialog-edit-bookmark/dialog-edit-bookmark.component'; -import { Bookmark } from '../bookmark.model'; -import { fadeAnimation } from '../../../ui/animations/fade.ani'; -import { DragulaService } from 'ng2-dragula'; -import { Subscription } from 'rxjs'; -import { slideAnimation } from '../../../ui/animations/slide.ani'; +import {ChangeDetectionStrategy, Component, ElementRef, HostListener, OnDestroy, ViewChild} from '@angular/core'; +import {BookmarkService} from '../bookmark.service'; +import {MatDialog} from '@angular/material/dialog'; +import {DialogEditBookmarkComponent} from '../dialog-edit-bookmark/dialog-edit-bookmark.component'; +import {Bookmark} from '../bookmark.model'; +import {fadeAnimation} from '../../../ui/animations/fade.ani'; +import {DragulaService} from 'ng2-dragula'; +import {Subscription} from 'rxjs'; +import {slideAnimation} from '../../../ui/animations/slide.ani'; @Component({ selector: 'bookmark-bar', @@ -26,7 +26,7 @@ export class BookmarkBarComponent implements OnDestroy { bookmarkBarHeight = 50; - @ViewChild('bookmarkBar', { read: ElementRef, static: false }) set bookmarkBarEl(content: ElementRef) { + @ViewChild('bookmarkBar', {read: ElementRef, static: false}) set bookmarkBarEl(content: ElementRef) { if (content && content.nativeElement) { this.bookmarkBarHeight = content.nativeElement.offsetHeight; } diff --git a/src/app/features/bookmark/bookmark-link/bookmark-link.directive.ts b/src/app/features/bookmark/bookmark-link/bookmark-link.directive.ts index c160a99d77..c1659d296d 100644 --- a/src/app/features/bookmark/bookmark-link/bookmark-link.directive.ts +++ b/src/app/features/bookmark/bookmark-link/bookmark-link.directive.ts @@ -1,9 +1,9 @@ -import { Directive, HostListener, Input } from '@angular/core'; -import { IS_ELECTRON } from '../../../app.constants'; -import { BookmarkType } from '../bookmark.model'; -import { ElectronService } from 'ngx-electron'; -import { SnackService } from '../../../core/snack/snack.service'; -import { IPC_EXEC } from '../../../../../electron/ipc-events.const'; +import {Directive, HostListener, Input} from '@angular/core'; +import {IS_ELECTRON} from '../../../app.constants'; +import {BookmarkType} from '../bookmark.model'; +import {ElectronService} from 'ngx-electron'; +import {SnackService} from '../../../core/snack/snack.service'; +import {IPC_EXEC} from '../../../../../electron/ipc-events.const'; @Directive({ diff --git a/src/app/features/bookmark/bookmark.model.ts b/src/app/features/bookmark/bookmark.model.ts index 2cc70e4df6..e90c477c02 100644 --- a/src/app/features/bookmark/bookmark.model.ts +++ b/src/app/features/bookmark/bookmark.model.ts @@ -1,4 +1,4 @@ -import { DropPasteInput, DropPasteInputType } from '../../core/drop-paste-input/drop-paste-input'; +import {DropPasteInput, DropPasteInputType} from '../../core/drop-paste-input/drop-paste-input'; export type BookmarkType = DropPasteInputType; diff --git a/src/app/features/bookmark/bookmark.module.ts b/src/app/features/bookmark/bookmark.module.ts index b30098a0f9..797b6fc590 100644 --- a/src/app/features/bookmark/bookmark.module.ts +++ b/src/app/features/bookmark/bookmark.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { BookmarkBarComponent } from './bookmark-bar/bookmark-bar.component'; -import { StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; -import { BookmarkEffects } from './store/bookmark.effects'; -import { UiModule } from '../../ui/ui.module'; -import { BOOKMARK_FEATURE_NAME, bookmarkReducer } from './store/bookmark.reducer'; -import { DialogEditBookmarkComponent } from './dialog-edit-bookmark/dialog-edit-bookmark.component'; -import { FormsModule } from '@angular/forms'; -import { BookmarkLinkDirective } from './bookmark-link/bookmark-link.directive'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {BookmarkBarComponent} from './bookmark-bar/bookmark-bar.component'; +import {StoreModule} from '@ngrx/store'; +import {EffectsModule} from '@ngrx/effects'; +import {BookmarkEffects} from './store/bookmark.effects'; +import {UiModule} from '../../ui/ui.module'; +import {BOOKMARK_FEATURE_NAME, bookmarkReducer} from './store/bookmark.reducer'; +import {DialogEditBookmarkComponent} from './dialog-edit-bookmark/dialog-edit-bookmark.component'; +import {FormsModule} from '@angular/forms'; +import {BookmarkLinkDirective} from './bookmark-link/bookmark-link.directive'; @NgModule({ imports: [ diff --git a/src/app/features/bookmark/bookmark.service.ts b/src/app/features/bookmark/bookmark.service.ts index f996e7f4ba..dca7a4b358 100644 --- a/src/app/features/bookmark/bookmark.service.ts +++ b/src/app/features/bookmark/bookmark.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@angular/core'; -import { select, Store } from '@ngrx/store'; +import {Injectable} from '@angular/core'; +import {select, Store} from '@ngrx/store'; import { BookmarkState, initialBookmarkState, @@ -16,13 +16,13 @@ import { ToggleBookmarks, UpdateBookmark } from './store/bookmark.actions'; -import { Observable } from 'rxjs'; -import { Bookmark } from './bookmark.model'; +import {Observable} from 'rxjs'; +import {Bookmark} from './bookmark.model'; import shortid from 'shortid'; -import { DialogEditBookmarkComponent } from './dialog-edit-bookmark/dialog-edit-bookmark.component'; -import { MatDialog } from '@angular/material/dialog'; -import { PersistenceService } from '../../core/persistence/persistence.service'; -import { createFromDrop, createFromPaste, DropPasteInput } from '../../core/drop-paste-input/drop-paste-input'; +import {DialogEditBookmarkComponent} from './dialog-edit-bookmark/dialog-edit-bookmark.component'; +import {MatDialog} from '@angular/material/dialog'; +import {PersistenceService} from '../../core/persistence/persistence.service'; +import {createFromDrop, createFromPaste, DropPasteInput} from '../../core/drop-paste-input/drop-paste-input'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.scss b/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.scss index 770751db3e..ea882f08d3 100644 --- a/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.scss +++ b/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.scss @@ -3,6 +3,7 @@ flex-wrap: wrap; flex-direction: column; } + .form-wrapper { display: flex; flex-direction: column; diff --git a/src/app/features/bookmark/store/bookmark.actions.ts b/src/app/features/bookmark/store/bookmark.actions.ts index 5c84a2ccdd..488b0dc9ed 100644 --- a/src/app/features/bookmark/store/bookmark.actions.ts +++ b/src/app/features/bookmark/store/bookmark.actions.ts @@ -1,7 +1,7 @@ -import { Action } from '@ngrx/store'; -import { Update } from '@ngrx/entity'; -import { Bookmark } from '../bookmark.model'; -import { BookmarkState } from './bookmark.reducer'; +import {Action} from '@ngrx/store'; +import {Update} from '@ngrx/entity'; +import {Bookmark} from '../bookmark.model'; +import {BookmarkState} from './bookmark.reducer'; export enum BookmarkActionTypes { LoadBookmarkState = '[Bookmark] Load Bookmark State', diff --git a/src/app/features/bookmark/store/bookmark.effects.ts b/src/app/features/bookmark/store/bookmark.effects.ts index 16e6feb376..5c7a5acfb0 100644 --- a/src/app/features/bookmark/store/bookmark.effects.ts +++ b/src/app/features/bookmark/store/bookmark.effects.ts @@ -1,11 +1,11 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { tap, withLatestFrom } from 'rxjs/operators'; -import { select, Store } from '@ngrx/store'; -import { selectCurrentProjectId } from '../../project/store/project.reducer'; -import { BookmarkActionTypes } from './bookmark.actions'; -import { selectBookmarkFeatureState } from './bookmark.reducer'; -import { PersistenceService } from '../../../core/persistence/persistence.service'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {tap, withLatestFrom} from 'rxjs/operators'; +import {select, Store} from '@ngrx/store'; +import {selectCurrentProjectId} from '../../project/store/project.reducer'; +import {BookmarkActionTypes} from './bookmark.actions'; +import {selectBookmarkFeatureState} from './bookmark.reducer'; +import {PersistenceService} from '../../../core/persistence/persistence.service'; @Injectable() export class BookmarkEffects { diff --git a/src/app/features/bookmark/store/bookmark.reducer.spec.ts b/src/app/features/bookmark/store/bookmark.reducer.spec.ts index ad232027a2..9edec3ae1e 100644 --- a/src/app/features/bookmark/store/bookmark.reducer.spec.ts +++ b/src/app/features/bookmark/store/bookmark.reducer.spec.ts @@ -1,5 +1,5 @@ -import { bookmarkReducer, initialBookmarkState } from './bookmark.reducer'; -import { ToggleBookmarks } from './bookmark.actions'; +import {bookmarkReducer, initialBookmarkState} from './bookmark.reducer'; +import {ToggleBookmarks} from './bookmark.actions'; describe('Bookmark Reducer', () => { describe('unknown action', () => { diff --git a/src/app/features/bookmark/store/bookmark.reducer.ts b/src/app/features/bookmark/store/bookmark.reducer.ts index bd0643aa80..759b7bf6eb 100644 --- a/src/app/features/bookmark/store/bookmark.reducer.ts +++ b/src/app/features/bookmark/store/bookmark.reducer.ts @@ -1,7 +1,7 @@ -import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity'; -import { BookmarkActions, BookmarkActionTypes } from './bookmark.actions'; -import { Bookmark } from '../bookmark.model'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; +import {createEntityAdapter, EntityAdapter, EntityState} from '@ngrx/entity'; +import {BookmarkActions, BookmarkActionTypes} from './bookmark.actions'; +import {Bookmark} from '../bookmark.model'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; export const BOOKMARK_FEATURE_NAME = 'bookmark'; diff --git a/src/app/features/config/config-form/config-form.component.ts b/src/app/features/config/config-form/config-form.component.ts index 6714882e32..8178f8feeb 100644 --- a/src/app/features/config/config-form/config-form.component.ts +++ b/src/app/features/config/config-form/config-form.component.ts @@ -1,8 +1,8 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; -import { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core'; -import { FormGroup } from '@angular/forms'; -import { GlobalConfigSectionKey } from '../global-config.model'; -import { ProjectCfgFormKey } from '../../project/project.model'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; +import {FormlyFieldConfig, FormlyFormOptions} from '@ngx-formly/core'; +import {FormGroup} from '@angular/forms'; +import {GlobalConfigSectionKey} from '../global-config.model'; +import {ProjectCfgFormKey} from '../../project/project.model'; @Component({ selector: 'config-form', diff --git a/src/app/features/config/config-section/config-section.component.ts b/src/app/features/config/config-section/config-section.component.ts index 5fde3211b9..8b881bdcb1 100644 --- a/src/app/features/config/config-section/config-section.component.ts +++ b/src/app/features/config/config-section/config-section.component.ts @@ -12,14 +12,14 @@ import { ViewChild, ViewContainerRef } from '@angular/core'; -import { expandAnimation } from '../../../ui/animations/expand.ani'; -import { ConfigFormSection, GlobalConfigSectionKey } from '../global-config.model'; -import { ProjectCfgFormKey } from '../../project/project.model'; -import { GoogleSyncCfgComponent } from '../../google/google-sync-cfg/google-sync-cfg.component'; -import { JiraCfgComponent } from '../../issue/jira/jira-cfg/jira-cfg.component'; -import { FileImexComponent } from '../../../imex/file-imex/file-imex.component'; -import { ProjectService } from '../../project/project.service'; -import { Subscription } from 'rxjs'; +import {expandAnimation} from '../../../ui/animations/expand.ani'; +import {ConfigFormSection, GlobalConfigSectionKey} from '../global-config.model'; +import {ProjectCfgFormKey} from '../../project/project.model'; +import {GoogleSyncCfgComponent} from '../../google/google-sync-cfg/google-sync-cfg.component'; +import {JiraCfgComponent} from '../../issue/jira/jira-cfg/jira-cfg.component'; +import {FileImexComponent} from '../../../imex/file-imex/file-imex.component'; +import {ProjectService} from '../../project/project.service'; +import {Subscription} from 'rxjs'; @Component({ selector: 'config-section', @@ -33,7 +33,7 @@ export class ConfigSectionComponent implements OnInit, OnDestroy { @Input() cfg: any; @Output() save: EventEmitter<{ sectionKey: GlobalConfigSectionKey | ProjectCfgFormKey, config: any }> = new EventEmitter(); - @ViewChild('customForm', { read: ViewContainerRef, static: true }) customFormRef: ViewContainerRef; + @ViewChild('customForm', {read: ViewContainerRef, static: true}) customFormRef: ViewContainerRef; isExpanded = false; diff --git a/src/app/features/config/config.module.ts b/src/app/features/config/config.module.ts index b7f598253f..b5ce422929 100644 --- a/src/app/features/config/config.module.ts +++ b/src/app/features/config/config.module.ts @@ -1,18 +1,18 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StoreModule } from '@ngrx/store'; -import { CONFIG_FEATURE_NAME, globalConfigReducer } from './store/global-config.reducer'; -import { EffectsModule } from '@ngrx/effects'; -import { GlobalConfigEffects } from './store/global-config.effects'; -import { ConfigSectionComponent } from './config-section/config-section.component'; -import { ConfigFormComponent } from './config-form/config-form.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { FormlyModule } from '@ngx-formly/core'; -import { FormlyMaterialModule } from '@ngx-formly/material'; -import { UiModule } from '../../ui/ui.module'; -import { KeyboardInputComponent } from './keyboard-input/keyboard-input.component'; -import { GoogleSyncCfgComponent } from '../google/google-sync-cfg/google-sync-cfg.component'; -import { FileImexModule } from '../../imex/file-imex/file-imex.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {StoreModule} from '@ngrx/store'; +import {CONFIG_FEATURE_NAME, globalConfigReducer} from './store/global-config.reducer'; +import {EffectsModule} from '@ngrx/effects'; +import {GlobalConfigEffects} from './store/global-config.effects'; +import {ConfigSectionComponent} from './config-section/config-section.component'; +import {ConfigFormComponent} from './config-form/config-form.component'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {FormlyModule} from '@ngx-formly/core'; +import {FormlyMaterialModule} from '@ngx-formly/material'; +import {UiModule} from '../../ui/ui.module'; +import {KeyboardInputComponent} from './keyboard-input/keyboard-input.component'; +import {GoogleSyncCfgComponent} from '../google/google-sync-cfg/google-sync-cfg.component'; +import {FileImexModule} from '../../imex/file-imex/file-imex.module'; @NgModule({ imports: [ diff --git a/src/app/features/config/form-cfgs/keyboard-form.const.ts b/src/app/features/config/form-cfgs/keyboard-form.const.ts index 9e4b9fb482..b1236288b3 100644 --- a/src/app/features/config/form-cfgs/keyboard-form.const.ts +++ b/src/app/features/config/form-cfgs/keyboard-form.const.ts @@ -1,5 +1,5 @@ // tslint:disable:max-line-length -import { ConfigFormSection } from '../global-config.model'; +import {ConfigFormSection} from '../global-config.model'; export const KEYBOARD_SETTINGS_FORM_CFG: ConfigFormSection = { title: 'Keyboard Shortcuts', diff --git a/src/app/features/config/form-cfgs/pomodoro-form.const.ts b/src/app/features/config/form-cfgs/pomodoro-form.const.ts index 551202acdb..6f2fd38820 100644 --- a/src/app/features/config/form-cfgs/pomodoro-form.const.ts +++ b/src/app/features/config/form-cfgs/pomodoro-form.const.ts @@ -1,5 +1,5 @@ // tslint:disable:max-line-length -import { ConfigFormSection } from '../global-config.model'; +import {ConfigFormSection} from '../global-config.model'; export const POMODORO_FORM_CFG: ConfigFormSection = { title: 'Pomodoro Settings', diff --git a/src/app/features/config/form-cfgs/take-a-break-form.const.ts b/src/app/features/config/form-cfgs/take-a-break-form.const.ts index a4d89b7b49..11fab5a2c5 100644 --- a/src/app/features/config/form-cfgs/take-a-break-form.const.ts +++ b/src/app/features/config/form-cfgs/take-a-break-form.const.ts @@ -1,5 +1,5 @@ // tslint:disable:max-line-length -import { ConfigFormSection } from '../global-config.model'; +import {ConfigFormSection} from '../global-config.model'; export const TAKE_A_BREAK_FORM_CFG: ConfigFormSection = { title: 'Break Reminder', diff --git a/src/app/features/config/global-config-form-config.const.ts b/src/app/features/config/global-config-form-config.const.ts index fd2c2274f9..e548a7306b 100644 --- a/src/app/features/config/global-config-form-config.const.ts +++ b/src/app/features/config/global-config-form-config.const.ts @@ -1,7 +1,7 @@ -import { MISC_SETTINGS_FORM_CFG } from './form-cfgs/misc-settings-form.const'; -import { KEYBOARD_SETTINGS_FORM_CFG } from './form-cfgs/keyboard-form.const'; -import { ConfigFormConfig } from './global-config.model'; -import { POMODORO_FORM_CFG } from './form-cfgs/pomodoro-form.const'; +import {MISC_SETTINGS_FORM_CFG} from './form-cfgs/misc-settings-form.const'; +import {KEYBOARD_SETTINGS_FORM_CFG} from './form-cfgs/keyboard-form.const'; +import {ConfigFormConfig} from './global-config.model'; +import {POMODORO_FORM_CFG} from './form-cfgs/pomodoro-form.const'; import {IDLE_FORM_CFG} from './form-cfgs/idle-form.const'; import {TAKE_A_BREAK_FORM_CFG} from './form-cfgs/take-a-break-form.const'; diff --git a/src/app/features/config/global-config.model.ts b/src/app/features/config/global-config.model.ts index 134f28907e..1d5b3efd27 100644 --- a/src/app/features/config/global-config.model.ts +++ b/src/app/features/config/global-config.model.ts @@ -1,5 +1,5 @@ -import { FormlyFieldConfig } from '@ngx-formly/core'; -import { ProjectCfgFormKey } from '../project/project.model'; +import {FormlyFieldConfig} from '@ngx-formly/core'; +import {ProjectCfgFormKey} from '../project/project.model'; export type KeyboardConfig = Readonly<{ globalShowHide: string, diff --git a/src/app/features/config/global-config.service.ts b/src/app/features/config/global-config.service.ts index 851acce26f..b71aa00481 100644 --- a/src/app/features/config/global-config.service.ts +++ b/src/app/features/config/global-config.service.ts @@ -8,13 +8,15 @@ import { GlobalSectionConfig, GoogleSession, IdleConfig, - MiscConfig, TakeABreakConfig + MiscConfig, + TakeABreakConfig } from './global-config.model'; import { selectConfigFeatureState, selectGoogleSession, selectIdleConfig, - selectMiscConfig, selectTakeABreakConfig + selectMiscConfig, + selectTakeABreakConfig } from './store/global-config.reducer'; import {PersistenceService} from '../../core/persistence/persistence.service'; import {Actions, ofType} from '@ngrx/effects'; diff --git a/src/app/features/config/keyboard-input/keyboard-input.component.ts b/src/app/features/config/keyboard-input/keyboard-input.component.ts index acfc8a23e9..78a87f9c3f 100644 --- a/src/app/features/config/keyboard-input/keyboard-input.component.ts +++ b/src/app/features/config/keyboard-input/keyboard-input.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component, ViewChild } from '@angular/core'; -import { FieldType } from '@ngx-formly/material/form-field'; -import { MatInput } from '@angular/material/input'; +import {ChangeDetectionStrategy, Component, ViewChild} from '@angular/core'; +import {FieldType} from '@ngx-formly/material/form-field'; +import {MatInput} from '@angular/material/input'; @Component({ selector: 'keyboard-input', @@ -9,7 +9,7 @@ import { MatInput } from '@angular/material/input'; changeDetection: ChangeDetectionStrategy.OnPush }) export class KeyboardInputComponent extends FieldType { - @ViewChild(MatInput, { static: true }) formFieldControl: MatInput; + @ViewChild(MatInput, {static: true}) formFieldControl: MatInput; get type() { return this.to.type || 'text'; diff --git a/src/app/features/config/store/global-config.actions.ts b/src/app/features/config/store/global-config.actions.ts index 91f57c037f..64fb270f25 100644 --- a/src/app/features/config/store/global-config.actions.ts +++ b/src/app/features/config/store/global-config.actions.ts @@ -1,5 +1,5 @@ -import { Action } from '@ngrx/store'; -import { GlobalConfigSectionKey, GlobalConfigState, GlobalSectionConfig } from '../global-config.model'; +import {Action} from '@ngrx/store'; +import {GlobalConfigSectionKey, GlobalConfigState, GlobalSectionConfig} from '../global-config.model'; export enum GlobalConfigActionTypes { LoadGlobalConfig = '[Global Config] Load Global Config', diff --git a/src/app/features/config/store/global-config.effects.ts b/src/app/features/config/store/global-config.effects.ts index a8cc1ac753..921a4dbccc 100644 --- a/src/app/features/config/store/global-config.effects.ts +++ b/src/app/features/config/store/global-config.effects.ts @@ -1,15 +1,15 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { filter, tap, withLatestFrom } from 'rxjs/operators'; -import { GlobalConfigActionTypes, LoadGlobalConfig, UpdateGlobalConfigSection } from './global-config.actions'; -import { Store } from '@ngrx/store'; -import { CONFIG_FEATURE_NAME } from './global-config.reducer'; -import { PersistenceService } from '../../../core/persistence/persistence.service'; -import { SnackOpen } from '../../../core/snack/store/snack.actions'; -import { ElectronService } from 'ngx-electron'; -import { KeyboardConfig } from '../global-config.model'; -import { IPC_REGISTER_GLOBAL_SHORTCUTS_EVENT } from '../../../../../electron/ipc-events.const'; -import { IS_ELECTRON } from '../../../app.constants'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {filter, tap, withLatestFrom} from 'rxjs/operators'; +import {GlobalConfigActionTypes, LoadGlobalConfig, UpdateGlobalConfigSection} from './global-config.actions'; +import {Store} from '@ngrx/store'; +import {CONFIG_FEATURE_NAME} from './global-config.reducer'; +import {PersistenceService} from '../../../core/persistence/persistence.service'; +import {SnackOpen} from '../../../core/snack/store/snack.actions'; +import {ElectronService} from 'ngx-electron'; +import {KeyboardConfig} from '../global-config.model'; +import {IPC_REGISTER_GLOBAL_SHORTCUTS_EVENT} from '../../../../../electron/ipc-events.const'; +import {IS_ELECTRON} from '../../../app.constants'; @Injectable() export class GlobalConfigEffects { diff --git a/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts b/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts index 9ef6c42dd3..78d91e24cc 100644 --- a/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts +++ b/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; @Component({ selector: 'dialog-confirm-drive-sync-load', diff --git a/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts b/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts index 2934c74137..11cf1cb4f6 100644 --- a/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts +++ b/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; @Component({ selector: 'dialog-confirm-drive-sync-save', diff --git a/src/app/features/google/google-drive-sync.service.ts b/src/app/features/google/google-drive-sync.service.ts index a265972ab5..6c86c6639c 100644 --- a/src/app/features/google/google-drive-sync.service.ts +++ b/src/app/features/google/google-drive-sync.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { Store } from '@ngrx/store'; +import {Injectable} from '@angular/core'; +import {Observable} from 'rxjs'; +import {Store} from '@ngrx/store'; import { ChangeSyncFileName, GoogleDriveSyncActionTypes, @@ -8,12 +8,12 @@ import { SaveForSync, SaveToGoogleDriveFlow } from './store/google-drive-sync.actions'; -import { selectIsGoogleDriveLoadInProgress, selectIsGoogleDriveSaveInProgress } from './store/google-drive-sync.reducer'; -import { distinctUntilChanged, map } from 'rxjs/operators'; -import { GlobalConfigService } from '../config/global-config.service'; -import { SyncService } from '../../imex/sync/sync.service'; -import { Actions, ofType } from '@ngrx/effects'; -import { GoogleDriveSyncConfig } from '../config/global-config.model'; +import {selectIsGoogleDriveLoadInProgress, selectIsGoogleDriveSaveInProgress} from './store/google-drive-sync.reducer'; +import {distinctUntilChanged, map} from 'rxjs/operators'; +import {GlobalConfigService} from '../config/global-config.service'; +import {SyncService} from '../../imex/sync/sync.service'; +import {Actions, ofType} from '@ngrx/effects'; +import {GoogleDriveSyncConfig} from '../config/global-config.model'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html index ea8ea10a44..37e45d2913 100644 --- a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html +++ b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html @@ -80,31 +80,31 @@
+ name="isAutoLogin" + aria-label="Auto login at when starting app"> Auto login at when starting app
+ name="isLoadRemoteDataOnStartup" + aria-label="Load remote data on startup"> Load remote data on startup + name="isAutoSyncToRemote" + aria-label="Auto sync data TO remote"> Auto sync data TO remote + name="isCompressData" + aria-label="Compress Data"> Compress Data + name="isNotifyOnSync" + aria-label="Notify when syncing"> Notify when syncing diff --git a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.scss b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.scss index 01944b4ce5..2827c382f7 100644 --- a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.scss +++ b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.scss @@ -26,7 +26,7 @@ margin-left: 0; } - ::ng-deep .mat-button-wrapper{ + ::ng-deep .mat-button-wrapper { text-overflow: ellipsis; overflow: hidden; } diff --git a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts index 7d5992416a..a622a17c60 100644 --- a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts +++ b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts @@ -1,12 +1,21 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { GoogleApiService } from '../google-api.service'; -import { GlobalConfigService } from '../../config/global-config.service'; -import { GoogleDriveSyncService } from '../google-drive-sync.service'; -import { SnackService } from '../../../core/snack/snack.service'; -import { GoogleDriveSyncConfig } from '../../config/global-config.model'; -import { Subscription } from 'rxjs'; -import { expandFadeAnimation } from '../../../ui/animations/expand.ani'; -import { FormGroup } from '@angular/forms'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + EventEmitter, + OnDestroy, + OnInit, + Output, + ViewChild +} from '@angular/core'; +import {GoogleApiService} from '../google-api.service'; +import {GlobalConfigService} from '../../config/global-config.service'; +import {GoogleDriveSyncService} from '../google-drive-sync.service'; +import {SnackService} from '../../../core/snack/snack.service'; +import {GoogleDriveSyncConfig} from '../../config/global-config.model'; +import {Subscription} from 'rxjs'; +import {expandFadeAnimation} from '../../../ui/animations/expand.ani'; +import {FormGroup} from '@angular/forms'; @Component({ selector: 'google-sync-cfg', @@ -20,7 +29,7 @@ export class GoogleSyncCfgComponent implements OnInit, OnDestroy { cfg: GoogleDriveSyncConfig; loginPromise: Promise; - @ViewChild('formRef', { static: true }) formRef: FormGroup; + @ViewChild('formRef', {static: true}) formRef: FormGroup; @Output() save = new EventEmitter(); diff --git a/src/app/features/google/google.module.ts b/src/app/features/google/google.module.ts index 5b297af973..35a50d758f 100644 --- a/src/app/features/google/google.module.ts +++ b/src/app/features/google/google.module.ts @@ -1,15 +1,15 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { UiModule } from '../../ui/ui.module'; -import { DialogConfirmDriveSyncLoadComponent } from './dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component'; -import { DialogConfirmDriveSyncSaveComponent } from './dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component'; -import { GoogleExportTimeComponent } from './google-export-time/google-export-time.component'; -import { EffectsModule } from '@ngrx/effects'; -import { GoogleDriveSyncEffects } from './store/google-drive-sync.effects'; -import { StoreModule } from '@ngrx/store'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {UiModule} from '../../ui/ui.module'; +import {DialogConfirmDriveSyncLoadComponent} from './dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component'; +import {DialogConfirmDriveSyncSaveComponent} from './dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component'; +import {GoogleExportTimeComponent} from './google-export-time/google-export-time.component'; +import {EffectsModule} from '@ngrx/effects'; +import {GoogleDriveSyncEffects} from './store/google-drive-sync.effects'; +import {StoreModule} from '@ngrx/store'; import * as fromGoogleDriveSync from './store/google-drive-sync.reducer'; -import { GOOGLE_DRIVE_FEATURE_NAME } from './store/google-drive-sync.reducer'; +import {GOOGLE_DRIVE_FEATURE_NAME} from './store/google-drive-sync.reducer'; @NgModule({ imports: [ diff --git a/src/app/features/google/store/google-drive-sync.actions.ts b/src/app/features/google/store/google-drive-sync.actions.ts index c5f2eee183..4d6e3a0145 100644 --- a/src/app/features/google/store/google-drive-sync.actions.ts +++ b/src/app/features/google/store/google-drive-sync.actions.ts @@ -1,4 +1,4 @@ -import { Action } from '@ngrx/store'; +import {Action} from '@ngrx/store'; export enum GoogleDriveSyncActionTypes { LoadFromGoogleDrive = '[GoogleDriveSync] Load From', diff --git a/src/app/features/google/store/google-drive-sync.effects.ts b/src/app/features/google/store/google-drive-sync.effects.ts index 1794b2a402..e12558a63f 100644 --- a/src/app/features/google/store/google-drive-sync.effects.ts +++ b/src/app/features/google/store/google-drive-sync.effects.ts @@ -35,7 +35,7 @@ import { SaveToGoogleDriveSuccess } from './google-drive-sync.actions'; import {DialogConfirmComponent} from '../../../ui/dialog-confirm/dialog-confirm.component'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import {MatDialog, MatDialogRef} from '@angular/material/dialog'; import {GoogleDriveSyncConfig} from '../../config/global-config.model'; import {SyncService} from '../../../imex/sync/sync.service'; import {SnackOpen} from '../../../core/snack/store/snack.actions'; @@ -229,7 +229,7 @@ export class GoogleDriveSyncEffects { from(this._getLocalAppData()).pipe( withLatestFrom(this.config$), concatMap(([completeData, cfg]) => { - const contentObs: Observable = (cfg.isCompressData) + const contentObs: Observable = (cfg.isCompressData) ? from(this._compressionService.compressUTF16(JSON.stringify(completeData))) : of(completeData); diff --git a/src/app/features/google/store/google-drive-sync.reducer.ts b/src/app/features/google/store/google-drive-sync.reducer.ts index 5ed454947f..b22e326014 100644 --- a/src/app/features/google/store/google-drive-sync.reducer.ts +++ b/src/app/features/google/store/google-drive-sync.reducer.ts @@ -1,5 +1,5 @@ -import { Action, createFeatureSelector, createSelector } from '@ngrx/store'; -import { GoogleDriveSyncActionTypes } from './google-drive-sync.actions'; +import {Action, createFeatureSelector, createSelector} from '@ngrx/store'; +import {GoogleDriveSyncActionTypes} from './google-drive-sync.actions'; export const GOOGLE_DRIVE_FEATURE_NAME = 'googleDrive'; diff --git a/src/app/features/issue/github/dialog-github-initial-setup/dialog-github-initial-setup.component.ts b/src/app/features/issue/github/dialog-github-initial-setup/dialog-github-initial-setup.component.ts index 3541f383c9..bdba14c5b0 100644 --- a/src/app/features/issue/github/dialog-github-initial-setup/dialog-github-initial-setup.component.ts +++ b/src/app/features/issue/github/dialog-github-initial-setup/dialog-github-initial-setup.component.ts @@ -1,10 +1,9 @@ -import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { GithubCfg } from '../github'; -import { FormGroup } from '@angular/forms'; -import { FormlyFieldConfig } from '@ngx-formly/core'; -import { DEFAULT_GITHUB_CFG, GITHUB_CONFIG_FORM } from '../github.const'; -import {dirtyDeepCopy} from '../../../../util/dirtyDeepCopy'; +import {ChangeDetectionStrategy, Component, Inject, OnInit} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {GithubCfg} from '../github'; +import {FormGroup} from '@angular/forms'; +import {FormlyFieldConfig} from '@ngx-formly/core'; +import {DEFAULT_GITHUB_CFG, GITHUB_CONFIG_FORM} from '../github.const'; @Component({ selector: 'dialog-github-initial-setup', diff --git a/src/app/features/issue/github/github-api.service.ts b/src/app/features/issue/github/github-api.service.ts index 1fd289d4aa..7781359f30 100644 --- a/src/app/features/issue/github/github-api.service.ts +++ b/src/app/features/issue/github/github-api.service.ts @@ -1,18 +1,18 @@ -import { Injectable } from '@angular/core'; -import { ProjectService } from '../../project/project.service'; -import { GithubCfg } from './github'; -import { SnackService } from '../../../core/snack/snack.service'; -import { HttpClient, HttpErrorResponse } from '@angular/common/http'; -import { GITHUB_API_BASE_URL, GITHUB_MAX_CACHE_AGE } from './github.const'; -import { combineLatest, from, Observable, ObservableInput, Subject, throwError } from 'rxjs'; -import { GithubOriginalComment, GithubOriginalIssue } from './github-api-responses'; -import { catchError, map, share, switchMap, take, tap } from 'rxjs/operators'; -import { mapGithubIssue, mapGithubIssueToSearchResult } from './github-issue/github-issue-map.util'; -import { GithubComment, GithubIssue } from './github-issue/github-issue.model'; -import { SearchResultItem } from '../issue'; -import { loadFromLs, saveToLs } from '../../../core/persistence/local-storage'; -import { LS_GITHUB_ISSUE_CACHE_PREFIX } from '../../../core/persistence/ls-keys.const'; -import { HANDLED_ERROR } from '../../../app.constants'; +import {Injectable} from '@angular/core'; +import {ProjectService} from '../../project/project.service'; +import {GithubCfg} from './github'; +import {SnackService} from '../../../core/snack/snack.service'; +import {HttpClient, HttpErrorResponse} from '@angular/common/http'; +import {GITHUB_API_BASE_URL, GITHUB_MAX_CACHE_AGE} from './github.const'; +import {combineLatest, from, Observable, ObservableInput, Subject, throwError} from 'rxjs'; +import {GithubOriginalComment, GithubOriginalIssue} from './github-api-responses'; +import {catchError, map, share, switchMap, take, tap} from 'rxjs/operators'; +import {mapGithubIssue, mapGithubIssueToSearchResult} from './github-issue/github-issue-map.util'; +import {GithubComment, GithubIssue} from './github-issue/github-issue.model'; +import {SearchResultItem} from '../issue'; +import {loadFromLs, saveToLs} from '../../../core/persistence/local-storage'; +import {LS_GITHUB_ISSUE_CACHE_PREFIX} from '../../../core/persistence/ls-keys.const'; +import {HANDLED_ERROR} from '../../../app.constants'; const BASE = GITHUB_API_BASE_URL; diff --git a/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.ts b/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.ts index 2436b74188..f0c6c3323b 100644 --- a/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.ts +++ b/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.ts @@ -1,9 +1,9 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../tasks/task.model'; -import { GithubIssueService } from '../github-issue.service'; -import { GithubApiService } from '../../github-api.service'; -import { GithubIssue } from '../github-issue.model'; -import { expandAnimation } from '../../../../../ui/animations/expand.ani'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {TaskWithSubTasks} from '../../../../tasks/task.model'; +import {GithubIssueService} from '../github-issue.service'; +import {GithubApiService} from '../../github-api.service'; +import {GithubIssue} from '../github-issue.model'; +import {expandAnimation} from '../../../../../ui/animations/expand.ani'; @Component({ selector: 'github-issue-content', diff --git a/src/app/features/issue/github/github-issue/github-issue-header/github-issue-header.component.ts b/src/app/features/issue/github/github-issue/github-issue-header/github-issue-header.component.ts index c73bfefa86..a7043a795a 100644 --- a/src/app/features/issue/github/github-issue/github-issue-header/github-issue-header.component.ts +++ b/src/app/features/issue/github/github-issue/github-issue-header/github-issue-header.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../tasks/task.model'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {TaskWithSubTasks} from '../../../../tasks/task.model'; @Component({ selector: 'github-issue-header', diff --git a/src/app/features/issue/github/github-issue/github-issue-map.util.ts b/src/app/features/issue/github/github-issue/github-issue-map.util.ts index 596deb4586..05619acff3 100644 --- a/src/app/features/issue/github/github-issue/github-issue-map.util.ts +++ b/src/app/features/issue/github/github-issue/github-issue-map.util.ts @@ -1,6 +1,6 @@ -import { GithubIssue } from './github-issue.model'; -import { GithubOriginalIssue } from '../github-api-responses'; -import { IssueProviderKey, SearchResultItem } from '../../issue'; +import {GithubIssue} from './github-issue.model'; +import {GithubOriginalIssue} from '../github-api-responses'; +import {IssueProviderKey, SearchResultItem} from '../../issue'; export const mapGithubIssue = (issue: GithubOriginalIssue): GithubIssue => { return { diff --git a/src/app/features/issue/github/github-issue/github-issue.module.ts b/src/app/features/issue/github/github-issue/github-issue.module.ts index b5cea482fd..8dfa929647 100644 --- a/src/app/features/issue/github/github-issue/github-issue.module.ts +++ b/src/app/features/issue/github/github-issue/github-issue.module.ts @@ -1,13 +1,13 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { UiModule } from '../../../../ui/ui.module'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; -import { GithubIssueEffects } from './store/github-issue.effects'; -import { GITHUB_ISSUE_FEATURE_NAME, githubIssueReducer } from './store/github-issue.reducer'; -import { GithubIssueHeaderComponent } from './github-issue-header/github-issue-header.component'; -import { GithubIssueContentComponent } from './github-issue-content/github-issue-content.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {UiModule} from '../../../../ui/ui.module'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {StoreModule} from '@ngrx/store'; +import {EffectsModule} from '@ngrx/effects'; +import {GithubIssueEffects} from './store/github-issue.effects'; +import {GITHUB_ISSUE_FEATURE_NAME, githubIssueReducer} from './store/github-issue.reducer'; +import {GithubIssueHeaderComponent} from './github-issue-header/github-issue-header.component'; +import {GithubIssueContentComponent} from './github-issue-content/github-issue-content.component'; @NgModule({ imports: [ diff --git a/src/app/features/issue/github/github-issue/github-issue.service.ts b/src/app/features/issue/github/github-issue/github-issue.service.ts index 1696949e2f..2c22f69d95 100644 --- a/src/app/features/issue/github/github-issue/github-issue.service.ts +++ b/src/app/features/issue/github/github-issue/github-issue.service.ts @@ -1,16 +1,16 @@ -import { Injectable } from '@angular/core'; -import { GithubIssue } from './github-issue.model'; -import { select, Store } from '@ngrx/store'; -import { GithubIssueActionTypes } from './store/github-issue.actions'; -import { PersistenceService } from '../../../../core/persistence/persistence.service'; -import { GithubIssueState, selectGithubIssueById } from './store/github-issue.reducer'; -import { take } from 'rxjs/operators'; -import { GithubApiService } from '../github-api.service'; -import { SnackService } from '../../../../core/snack/snack.service'; -import { GithubCfg } from '../github'; -import { Observable } from 'rxjs'; -import { GITHUB_TYPE } from '../../issue.const'; -import { truncate } from '../../../../util/truncate'; +import {Injectable} from '@angular/core'; +import {GithubIssue} from './github-issue.model'; +import {select, Store} from '@ngrx/store'; +import {GithubIssueActionTypes} from './store/github-issue.actions'; +import {PersistenceService} from '../../../../core/persistence/persistence.service'; +import {GithubIssueState, selectGithubIssueById} from './store/github-issue.reducer'; +import {take} from 'rxjs/operators'; +import {GithubApiService} from '../github-api.service'; +import {SnackService} from '../../../../core/snack/snack.service'; +import {GithubCfg} from '../github'; +import {Observable} from 'rxjs'; +import {GITHUB_TYPE} from '../../issue.const'; +import {truncate} from '../../../../util/truncate'; @Injectable({ diff --git a/src/app/features/issue/github/github-issue/store/github-issue.actions.ts b/src/app/features/issue/github/github-issue/store/github-issue.actions.ts index 275e44b366..8d5ddad40e 100644 --- a/src/app/features/issue/github/github-issue/store/github-issue.actions.ts +++ b/src/app/features/issue/github/github-issue/store/github-issue.actions.ts @@ -1,8 +1,7 @@ -import { Action } from '@ngrx/store'; -import { Update } from '@ngrx/entity'; -import { GithubIssue } from '../github-issue.model'; -import { GithubIssueState } from './github-issue.reducer'; -import { AddTask, DeleteTask, MoveToArchive, RestoreTask } from '../../../../tasks/store/task.actions'; +import {Action} from '@ngrx/store'; +import {Update} from '@ngrx/entity'; +import {GithubIssue} from '../github-issue.model'; +import {GithubIssueState} from './github-issue.reducer'; export enum GithubIssueActionTypes { LoadState = '[GithubIssue] Load GithubIssue State', diff --git a/src/app/features/issue/github/github-issue/store/github-issue.effects.ts b/src/app/features/issue/github/github-issue/store/github-issue.effects.ts index 8b09b6ad45..2d162eef98 100644 --- a/src/app/features/issue/github/github-issue/store/github-issue.effects.ts +++ b/src/app/features/issue/github/github-issue/store/github-issue.effects.ts @@ -1,24 +1,24 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { GithubIssueActionTypes } from './github-issue.actions'; -import { select, Store } from '@ngrx/store'; -import { delay, filter, map, switchMap, tap, throttleTime, withLatestFrom } from 'rxjs/operators'; -import { TaskActionTypes } from '../../../../tasks/store/task.actions'; -import { PersistenceService } from '../../../../../core/persistence/persistence.service'; -import { selectAllGithubIssues, selectGithubIssueFeatureState } from './github-issue.reducer'; -import { selectCurrentProjectId, selectProjectGithubCfg } from '../../../../project/store/project.reducer'; -import { GithubApiService } from '../../github-api.service'; -import { GithubIssueService } from '../github-issue.service'; -import { GlobalConfigService } from '../../../../config/global-config.service'; -import { SnackService } from '../../../../../core/snack/snack.service'; -import { TaskService } from '../../../../tasks/task.service'; -import { Task } from '../../../../tasks/task.model'; -import { ProjectActionTypes } from '../../../../project/store/project.actions'; -import { GITHUB_TYPE } from '../../../issue.const'; -import { EMPTY, timer } from 'rxjs'; -import { GITHUB_INITIAL_POLL_DELAY, GITHUB_POLL_INTERVAL, } from '../../github.const'; -import { GithubCfg } from '../../github'; -import { GithubIssue } from '../github-issue.model'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {GithubIssueActionTypes} from './github-issue.actions'; +import {select, Store} from '@ngrx/store'; +import {delay, filter, map, switchMap, tap, throttleTime, withLatestFrom} from 'rxjs/operators'; +import {TaskActionTypes} from '../../../../tasks/store/task.actions'; +import {PersistenceService} from '../../../../../core/persistence/persistence.service'; +import {selectAllGithubIssues, selectGithubIssueFeatureState} from './github-issue.reducer'; +import {selectCurrentProjectId, selectProjectGithubCfg} from '../../../../project/store/project.reducer'; +import {GithubApiService} from '../../github-api.service'; +import {GithubIssueService} from '../github-issue.service'; +import {GlobalConfigService} from '../../../../config/global-config.service'; +import {SnackService} from '../../../../../core/snack/snack.service'; +import {TaskService} from '../../../../tasks/task.service'; +import {Task} from '../../../../tasks/task.model'; +import {ProjectActionTypes} from '../../../../project/store/project.actions'; +import {GITHUB_TYPE} from '../../../issue.const'; +import {EMPTY, timer} from 'rxjs'; +import {GITHUB_INITIAL_POLL_DELAY, GITHUB_POLL_INTERVAL,} from '../../github.const'; +import {GithubCfg} from '../../github'; +import {GithubIssue} from '../github-issue.model'; const isRepoConfigured_ = (githubCfg) => githubCfg && githubCfg.repo && githubCfg.repo.length > 2; const isRepoConfigured = ([a, githubCfg]) => isRepoConfigured_(githubCfg); diff --git a/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts b/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts index c41a2763f0..7061216830 100644 --- a/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts +++ b/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts @@ -1,10 +1,10 @@ -import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity'; -import { GithubIssueActions, GithubIssueActionTypes } from './github-issue.actions'; -import { GithubIssue } from '../github-issue.model'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; -import { TaskActions, TaskActionTypes } from '../../../../tasks/store/task.actions'; -import { IssueProviderKey } from '../../../issue'; -import { GITHUB_TYPE, LEGACY_GITHUB_TYPE } from '../../../issue.const'; +import {createEntityAdapter, EntityAdapter, EntityState} from '@ngrx/entity'; +import {GithubIssueActions, GithubIssueActionTypes} from './github-issue.actions'; +import {GithubIssue} from '../github-issue.model'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; +import {TaskActions, TaskActionTypes} from '../../../../tasks/store/task.actions'; +import {IssueProviderKey} from '../../../issue'; +import {GITHUB_TYPE, LEGACY_GITHUB_TYPE} from '../../../issue.const'; export const GITHUB_ISSUE_FEATURE_NAME: IssueProviderKey = GITHUB_TYPE; diff --git a/src/app/features/issue/github/github.const.ts b/src/app/features/issue/github/github.const.ts index 8edae32300..8eccaa5eab 100644 --- a/src/app/features/issue/github/github.const.ts +++ b/src/app/features/issue/github/github.const.ts @@ -1,6 +1,6 @@ // TODO use as a checklist -import { GithubCfg } from './github'; -import { FormlyFieldConfig } from '@ngx-formly/core'; +import {GithubCfg} from './github'; +import {FormlyFieldConfig} from '@ngx-formly/core'; export const DEFAULT_GITHUB_CFG: GithubCfg = { repo: null, diff --git a/src/app/features/issue/github/github.module.ts b/src/app/features/issue/github/github.module.ts index df42a1aa8d..b897b45bbd 100644 --- a/src/app/features/issue/github/github.module.ts +++ b/src/app/features/issue/github/github.module.ts @@ -1,7 +1,7 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { UiModule } from '../../../ui/ui.module'; -import { DialogGithubInitialSetupComponent } from './dialog-github-initial-setup/dialog-github-initial-setup.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {UiModule} from '../../../ui/ui.module'; +import {DialogGithubInitialSetupComponent} from './dialog-github-initial-setup/dialog-github-initial-setup.component'; @NgModule({ imports: [ diff --git a/src/app/features/issue/issue-content/issue-content.component.ts b/src/app/features/issue/issue-content/issue-content.component.ts index 233d0b786a..758f041c89 100644 --- a/src/app/features/issue/issue-content/issue-content.component.ts +++ b/src/app/features/issue/issue-content/issue-content.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { TaskWithSubTasks } from '../../tasks/task.model'; -import { GITHUB_TYPE, JIRA_TYPE } from '../issue.const'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {TaskWithSubTasks} from '../../tasks/task.model'; +import {GITHUB_TYPE, JIRA_TYPE} from '../issue.const'; @Component({ selector: 'issue-content', diff --git a/src/app/features/issue/issue-header/issue-header.component.ts b/src/app/features/issue/issue-header/issue-header.component.ts index 8ce4931bb8..a2a8b47f90 100644 --- a/src/app/features/issue/issue-header/issue-header.component.ts +++ b/src/app/features/issue/issue-header/issue-header.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { TaskWithSubTasks } from '../../tasks/task.model'; -import { GITHUB_TYPE, JIRA_TYPE } from '../issue.const'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {TaskWithSubTasks} from '../../tasks/task.model'; +import {GITHUB_TYPE, JIRA_TYPE} from '../issue.const'; @Component({ selector: 'issue-header', diff --git a/src/app/features/issue/issue-icon/issue-icon.pipe.ts b/src/app/features/issue/issue-icon/issue-icon.pipe.ts index bf21bcf604..05bb458b58 100644 --- a/src/app/features/issue/issue-icon/issue-icon.pipe.ts +++ b/src/app/features/issue/issue-icon/issue-icon.pipe.ts @@ -1,6 +1,6 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { IssueProviderKey } from '../issue'; -import { issueProviderIconMap } from '../issue.const'; +import {Pipe, PipeTransform} from '@angular/core'; +import {IssueProviderKey} from '../issue'; +import {issueProviderIconMap} from '../issue.const'; @Pipe({ name: 'issueIcon' diff --git a/src/app/features/issue/issue.const.ts b/src/app/features/issue/issue.const.ts index e673dcf3d5..99894c7a7f 100644 --- a/src/app/features/issue/issue.const.ts +++ b/src/app/features/issue/issue.const.ts @@ -1,7 +1,7 @@ -import { ConfigFormConfig } from '../config/global-config.model'; -import { DEFAULT_JIRA_CFG, JIRA_ADVANCED_FORM_CFG, JIRA_CREDENTIALS_FORM_CFG } from './jira/jira.const'; -import { IssueProviderKey } from './issue'; -import { DEFAULT_GITHUB_CFG, GITHUB_CONFIG_FORM } from './github/github.const'; +import {ConfigFormConfig} from '../config/global-config.model'; +import {DEFAULT_JIRA_CFG, JIRA_ADVANCED_FORM_CFG, JIRA_CREDENTIALS_FORM_CFG} from './jira/jira.const'; +import {IssueProviderKey} from './issue'; +import {DEFAULT_GITHUB_CFG, GITHUB_CONFIG_FORM} from './github/github.const'; export const LEGACY_GITHUB_TYPE = 'GIT'; diff --git a/src/app/features/issue/issue.d.ts b/src/app/features/issue/issue.d.ts index 88a4ab616a..1a916b55d9 100644 --- a/src/app/features/issue/issue.d.ts +++ b/src/app/features/issue/issue.d.ts @@ -1,9 +1,9 @@ -import { JiraIssue } from './jira/jira-issue/jira-issue.model'; -import { JiraCfg } from './jira/jira'; -import { GithubCfg } from './github/github'; -import { GithubIssue } from './github/github-issue/github-issue.model'; -import { JiraIssueState } from './jira/jira-issue/store/jira-issue.reducer'; -import { GithubIssueState } from './github/github-issue/store/github-issue.reducer'; +import {JiraIssue} from './jira/jira-issue/jira-issue.model'; +import {JiraCfg} from './jira/jira'; +import {GithubCfg} from './github/github'; +import {GithubIssue} from './github/github-issue/github-issue.model'; +import {JiraIssueState} from './jira/jira-issue/store/jira-issue.reducer'; +import {GithubIssueState} from './github/github-issue/store/github-issue.reducer'; export type IssueProviderKey = 'JIRA' | 'GITHUB'; diff --git a/src/app/features/issue/issue.module.ts b/src/app/features/issue/issue.module.ts index a3342c011c..89478b0b52 100644 --- a/src/app/features/issue/issue.module.ts +++ b/src/app/features/issue/issue.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { JiraIssueModule } from './jira/jira-issue/jira-issue.module'; -import { IssueHeaderComponent } from './issue-header/issue-header.component'; -import { IssueContentComponent } from './issue-content/issue-content.component'; -import { GithubIssueModule } from './github/github-issue/github-issue.module'; -import { IssueIconPipe } from './issue-icon/issue-icon.pipe'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {JiraIssueModule} from './jira/jira-issue/jira-issue.module'; +import {IssueHeaderComponent} from './issue-header/issue-header.component'; +import {IssueContentComponent} from './issue-content/issue-content.component'; +import {GithubIssueModule} from './github/github-issue/github-issue.module'; +import {IssueIconPipe} from './issue-icon/issue-icon.pipe'; @NgModule({ imports: [ diff --git a/src/app/features/issue/issue.selector.ts b/src/app/features/issue/issue.selector.ts index 9610ad263b..9a8ff109df 100644 --- a/src/app/features/issue/issue.selector.ts +++ b/src/app/features/issue/issue.selector.ts @@ -1,7 +1,7 @@ -import { createSelector } from '@ngrx/store'; -import { selectJiraIssueEntities } from './jira/jira-issue/store/jira-issue.reducer'; -import { selectGithubIssueEntities } from './github/github-issue/store/github-issue.reducer'; -import { GITHUB_TYPE, JIRA_TYPE } from './issue.const'; +import {createSelector} from '@ngrx/store'; +import {selectJiraIssueEntities} from './jira/jira-issue/store/jira-issue.reducer'; +import {selectGithubIssueEntities} from './github/github-issue/store/github-issue.reducer'; +import {GITHUB_TYPE, JIRA_TYPE} from './issue.const'; // TODO add git export const selectIssueEntityMap = createSelector( diff --git a/src/app/features/issue/issue.service.ts b/src/app/features/issue/issue.service.ts index d86afa0abd..a03f974f8f 100644 --- a/src/app/features/issue/issue.service.ts +++ b/src/app/features/issue/issue.service.ts @@ -1,15 +1,15 @@ -import { Injectable } from '@angular/core'; -import { IssueData, IssueProviderKey, SearchResultItem } from './issue'; -import { JiraIssue } from './jira/jira-issue/jira-issue.model'; -import { Attachment } from '../attachment/attachment.model'; -import { JiraApiService } from './jira/jira-api.service'; -import { GithubApiService } from './github/github-api.service'; -import { combineLatest, from, Observable, zip } from 'rxjs'; -import { ProjectService } from '../project/project.service'; -import { catchError, map, switchMap } from 'rxjs/operators'; -import { JiraIssueService } from './jira/jira-issue/jira-issue.service'; -import { GithubIssueService } from './github/github-issue/github-issue.service'; -import { GITHUB_TYPE, JIRA_TYPE } from './issue.const'; +import {Injectable} from '@angular/core'; +import {IssueData, IssueProviderKey, SearchResultItem} from './issue'; +import {JiraIssue} from './jira/jira-issue/jira-issue.model'; +import {Attachment} from '../attachment/attachment.model'; +import {JiraApiService} from './jira/jira-api.service'; +import {GithubApiService} from './github/github-api.service'; +import {combineLatest, from, Observable, zip} from 'rxjs'; +import {ProjectService} from '../project/project.service'; +import {catchError, map, switchMap} from 'rxjs/operators'; +import {JiraIssueService} from './jira/jira-issue/jira-issue.service'; +import {GithubIssueService} from './github/github-issue/github-issue.service'; +import {GITHUB_TYPE, JIRA_TYPE} from './issue.const'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/issue/jira/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts b/src/app/features/issue/jira/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts index 6adaa84535..f2a8f63a87 100644 --- a/src/app/features/issue/jira/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts +++ b/src/app/features/issue/jira/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, Inject, OnInit} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {JiraCfg} from '../jira'; diff --git a/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.html b/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.html index 63b71ad1da..f57c7f4185 100644 --- a/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.html +++ b/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.html @@ -1,6 +1,6 @@

+ class="dialog-header-icon"> Update Status on Jira

diff --git a/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.ts b/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.ts index 25f7aa0f06..f28ee3e604 100644 --- a/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.ts +++ b/src/app/features/issue/jira/dialog-jira-transition/dialog-jira-transition.component.ts @@ -1,13 +1,13 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { IssueLocalState } from '../../issue'; -import { JiraIssue } from '../jira-issue/jira-issue.model'; -import { JiraIssueService } from '../jira-issue/jira-issue.service'; -import { Observable } from 'rxjs'; -import { JiraApiService } from '../jira-api.service'; -import { JiraOriginalTransition } from '../jira-api-responses'; -import { SnackService } from '../../../../core/snack/snack.service'; -import { take } from 'rxjs/operators'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {IssueLocalState} from '../../issue'; +import {JiraIssue} from '../jira-issue/jira-issue.model'; +import {JiraIssueService} from '../jira-issue/jira-issue.service'; +import {Observable} from 'rxjs'; +import {JiraApiService} from '../jira-api.service'; +import {JiraOriginalTransition} from '../jira-api-responses'; +import {SnackService} from '../../../../core/snack/snack.service'; +import {take} from 'rxjs/operators'; @Component({ selector: 'dialog-jira-transition', diff --git a/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts b/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts index fd27f23d64..cb7063e14d 100644 --- a/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts +++ b/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts @@ -1,17 +1,17 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { ConfigFormSection, GlobalConfigSectionKey } from '../../../config/global-config.model'; -import { ProjectCfgFormKey } from '../../../project/project.model'; -import { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core'; -import { FormControl, FormGroup } from '@angular/forms'; -import { JiraCfg } from '../jira'; -import { expandAnimation } from '../../../../ui/animations/expand.ani'; -import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { SearchResultItem } from '../../issue'; -import { catchError, debounceTime, map, switchMap, tap } from 'rxjs/operators'; -import { JiraApiService } from '../jira-api.service'; -import { DEFAULT_JIRA_CFG } from '../jira.const'; -import { JiraIssue } from '../jira-issue/jira-issue.model'; -import { SnackService } from '../../../../core/snack/snack.service'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core'; +import {ConfigFormSection, GlobalConfigSectionKey} from '../../../config/global-config.model'; +import {ProjectCfgFormKey} from '../../../project/project.model'; +import {FormlyFieldConfig, FormlyFormOptions} from '@ngx-formly/core'; +import {FormControl, FormGroup} from '@angular/forms'; +import {JiraCfg} from '../jira'; +import {expandAnimation} from '../../../../ui/animations/expand.ani'; +import {BehaviorSubject, Observable, Subscription} from 'rxjs'; +import {SearchResultItem} from '../../issue'; +import {catchError, debounceTime, map, switchMap, tap} from 'rxjs/operators'; +import {JiraApiService} from '../jira-api.service'; +import {DEFAULT_JIRA_CFG} from '../jira.const'; +import {JiraIssue} from '../jira-issue/jira-issue.model'; +import {SnackService} from '../../../../core/snack/snack.service'; @Component({ selector: 'jira-cfg', diff --git a/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts b/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts index aa1bed7672..213e457e1c 100644 --- a/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts +++ b/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../tasks/task.model'; -import { JiraIssueService } from '../jira-issue.service'; -import { JiraApiService } from '../../jira-api.service'; -import { JiraIssue } from '../jira-issue.model'; -import { expandAnimation } from '../../../../../ui/animations/expand.ani'; -import { Attachment } from '../../../../attachment/attachment.model'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {TaskWithSubTasks} from '../../../../tasks/task.model'; +import {JiraIssueService} from '../jira-issue.service'; +import {JiraApiService} from '../../jira-api.service'; +import {JiraIssue} from '../jira-issue.model'; +import {expandAnimation} from '../../../../../ui/animations/expand.ani'; +import {Attachment} from '../../../../attachment/attachment.model'; @Component({ selector: 'jira-issue-content', diff --git a/src/app/features/issue/jira/jira-issue/jira-issue-header/jira-issue-header.component.ts b/src/app/features/issue/jira/jira-issue/jira-issue-header/jira-issue-header.component.ts index 105c7a1722..9c6bfc37fb 100644 --- a/src/app/features/issue/jira/jira-issue/jira-issue-header/jira-issue-header.component.ts +++ b/src/app/features/issue/jira/jira-issue/jira-issue-header/jira-issue-header.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../tasks/task.model'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {TaskWithSubTasks} from '../../../../tasks/task.model'; @Component({ selector: 'jira-issue-header', diff --git a/src/app/features/issue/jira/jira-issue/jira-issue.model.ts b/src/app/features/issue/jira/jira-issue/jira-issue.model.ts index 21dbdeb358..62a7078857 100644 --- a/src/app/features/issue/jira/jira-issue/jira-issue.model.ts +++ b/src/app/features/issue/jira/jira-issue/jira-issue.model.ts @@ -1,6 +1,11 @@ // Mapped Data Types // ----------------- -import { JiraIssueOriginalReduced, JiraOriginalComment, JiraOriginalComponent, JiraOriginalStatus } from '../jira-api-responses'; +import { + JiraIssueOriginalReduced, + JiraOriginalComment, + JiraOriginalComponent, + JiraOriginalStatus +} from '../jira-api-responses'; export type JiraAuthor = Readonly<{ id: string; diff --git a/src/app/features/issue/jira/jira-issue/jira-issue.module.ts b/src/app/features/issue/jira/jira-issue/jira-issue.module.ts index 6f977890b8..0b96c4d226 100644 --- a/src/app/features/issue/jira/jira-issue/jira-issue.module.ts +++ b/src/app/features/issue/jira/jira-issue/jira-issue.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { UiModule } from '../../../../ui/ui.module'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; -import { JiraIssueEffects } from './store/jira-issue.effects'; -import { JIRA_ISSUE_FEATURE_NAME, jiraIssueReducer } from './store/jira-issue.reducer'; -import { JiraIssueHeaderComponent } from './jira-issue-header/jira-issue-header.component'; -import { JiraIssueContentComponent } from './jira-issue-content/jira-issue-content.component'; -import { AttachmentModule } from '../../../attachment/attachment.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {UiModule} from '../../../../ui/ui.module'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {StoreModule} from '@ngrx/store'; +import {EffectsModule} from '@ngrx/effects'; +import {JiraIssueEffects} from './store/jira-issue.effects'; +import {JIRA_ISSUE_FEATURE_NAME, jiraIssueReducer} from './store/jira-issue.reducer'; +import {JiraIssueHeaderComponent} from './jira-issue-header/jira-issue-header.component'; +import {JiraIssueContentComponent} from './jira-issue-content/jira-issue-content.component'; +import {AttachmentModule} from '../../../attachment/attachment.module'; @NgModule({ imports: [ diff --git a/src/app/features/issue/jira/jira-issue/jira-issue.service.ts b/src/app/features/issue/jira/jira-issue/jira-issue.service.ts index 1f049e55ed..ad11cd7ff3 100644 --- a/src/app/features/issue/jira/jira-issue/jira-issue.service.ts +++ b/src/app/features/issue/jira/jira-issue/jira-issue.service.ts @@ -1,18 +1,16 @@ -import { Injectable } from '@angular/core'; -import { JiraChangelogEntry, JiraIssue } from './jira-issue.model'; -import { select, Store } from '@ngrx/store'; -import { AddOpenJiraIssuesToBacklog, JiraIssueActionTypes } from './store/jira-issue.actions'; -import { PersistenceService } from '../../../../core/persistence/persistence.service'; -import { JiraIssueState, selectJiraIssueById } from './store/jira-issue.reducer'; -import { mapJiraAttachmentToAttachment } from './jira-issue-map.util'; -import { Attachment } from '../../../attachment/attachment.model'; -import { JiraApiService } from '../jira-api.service'; -import { SnackService } from '../../../../core/snack/snack.service'; -import { IssueData } from '../../issue'; -import { take } from 'rxjs/operators'; +import {Injectable} from '@angular/core'; +import {JiraChangelogEntry, JiraIssue} from './jira-issue.model'; +import {select, Store} from '@ngrx/store'; +import {JiraIssueActionTypes} from './store/jira-issue.actions'; +import {PersistenceService} from '../../../../core/persistence/persistence.service'; +import {JiraIssueState, selectJiraIssueById} from './store/jira-issue.reducer'; +import {mapJiraAttachmentToAttachment} from './jira-issue-map.util'; +import {Attachment} from '../../../attachment/attachment.model'; +import {JiraApiService} from '../jira-api.service'; +import {SnackService} from '../../../../core/snack/snack.service'; +import {IssueData} from '../../issue'; +import {take} from 'rxjs/operators'; import {Observable, Subscription} from 'rxjs'; -import { DropPasteInputType } from '../../../../core/drop-paste-input/drop-paste-input'; -import { IS_ELECTRON } from '../../../../app.constants'; @Injectable({ diff --git a/src/app/features/issue/jira/jira-issue/store/jira-issue.actions.ts b/src/app/features/issue/jira/jira-issue/store/jira-issue.actions.ts index f8ab080fdf..99cfc0edc1 100644 --- a/src/app/features/issue/jira/jira-issue/store/jira-issue.actions.ts +++ b/src/app/features/issue/jira/jira-issue/store/jira-issue.actions.ts @@ -1,7 +1,7 @@ -import { Action } from '@ngrx/store'; -import { Update } from '@ngrx/entity'; -import { JiraIssue } from '../jira-issue.model'; -import { JiraIssueState } from './jira-issue.reducer'; +import {Action} from '@ngrx/store'; +import {Update} from '@ngrx/entity'; +import {JiraIssue} from '../jira-issue.model'; +import {JiraIssueState} from './jira-issue.reducer'; export enum JiraIssueActionTypes { LoadState = '[JiraIssue] Load JiraIssue State', diff --git a/src/app/features/issue/jira/jira-issue/store/jira-issue.reducer.ts b/src/app/features/issue/jira/jira-issue/store/jira-issue.reducer.ts index 8ed424f122..bfbb976a82 100644 --- a/src/app/features/issue/jira/jira-issue/store/jira-issue.reducer.ts +++ b/src/app/features/issue/jira/jira-issue/store/jira-issue.reducer.ts @@ -1,10 +1,10 @@ -import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity'; -import { JiraIssueActions, JiraIssueActionTypes } from './jira-issue.actions'; -import { JiraIssue } from '../jira-issue.model'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; -import { TaskActions, TaskActionTypes } from '../../../../tasks/store/task.actions'; -import { IssueProviderKey } from '../../../issue'; -import { JIRA_TYPE } from '../../../issue.const'; +import {createEntityAdapter, EntityAdapter, EntityState} from '@ngrx/entity'; +import {JiraIssueActions, JiraIssueActionTypes} from './jira-issue.actions'; +import {JiraIssue} from '../jira-issue.model'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; +import {TaskActions, TaskActionTypes} from '../../../../tasks/store/task.actions'; +import {IssueProviderKey} from '../../../issue'; +import {JIRA_TYPE} from '../../../issue.const'; export const JIRA_ISSUE_FEATURE_NAME: IssueProviderKey = JIRA_TYPE; diff --git a/src/app/features/issue/jira/jira.d.ts b/src/app/features/issue/jira/jira.d.ts index 4120827c75..aa38829752 100644 --- a/src/app/features/issue/jira/jira.d.ts +++ b/src/app/features/issue/jira/jira.d.ts @@ -1,4 +1,4 @@ -import { JiraOriginalTransition } from './jira-api-responses'; +import {JiraOriginalTransition} from './jira-api-responses'; export type JiraTransitionOption = 'ALWAYS_ASK' | 'DO_NOT' | JiraOriginalTransition; diff --git a/src/app/features/issue/jira/jira.module.ts b/src/app/features/issue/jira/jira.module.ts index bb94f8ac8b..1ffd5a8a9c 100644 --- a/src/app/features/issue/jira/jira.module.ts +++ b/src/app/features/issue/jira/jira.module.ts @@ -1,13 +1,13 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { JiraCfgStepperComponent } from './jira-cfg-stepper/jira-cfg-stepper.component'; -import { UiModule } from '../../../ui/ui.module'; -import { NgxElectronModule } from 'ngx-electron'; -import { DialogJiraInitialSetupComponent } from './dialog-jira-initial-setup/dialog-jira-initial-setup.component'; -import { JiraCfgComponent } from './jira-cfg/jira-cfg.component'; -import { FormsModule } from '@angular/forms'; -import { DialogJiraTransitionComponent } from './dialog-jira-transition/dialog-jira-transition.component'; -import { DialogJiraAddWorklogComponent } from './dialog-jira-add-worklog/dialog-jira-add-worklog.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {JiraCfgStepperComponent} from './jira-cfg-stepper/jira-cfg-stepper.component'; +import {UiModule} from '../../../ui/ui.module'; +import {NgxElectronModule} from 'ngx-electron'; +import {DialogJiraInitialSetupComponent} from './dialog-jira-initial-setup/dialog-jira-initial-setup.component'; +import {JiraCfgComponent} from './jira-cfg/jira-cfg.component'; +import {FormsModule} from '@angular/forms'; +import {DialogJiraTransitionComponent} from './dialog-jira-transition/dialog-jira-transition.component'; +import {DialogJiraAddWorklogComponent} from './dialog-jira-add-worklog/dialog-jira-add-worklog.component'; @NgModule({ imports: [ diff --git a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts index b8ff91fbe3..303d6e83e3 100644 --- a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts +++ b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts @@ -13,7 +13,7 @@ import {MetricCopy} from '../metric.model'; import {MetricService} from '../metric.service'; import {ObstructionService} from '../obstruction/obstruction.service'; import {ImprovementService} from '../improvement/improvement.service'; -import {BehaviorSubject, combineLatest, Observable, Subscription} from 'rxjs'; +import {BehaviorSubject, combineLatest, Subscription} from 'rxjs'; import {NoteService} from '../../note/note.service'; import {getWorklogStr} from '../../../util/get-work-log-str'; import {filter, map, switchMap, withLatestFrom} from 'rxjs/operators'; diff --git a/src/app/features/metric/improvement-banner/improvement-banner.component.ts b/src/app/features/metric/improvement-banner/improvement-banner.component.ts index b5c5e5b1fa..c4dfb445e8 100644 --- a/src/app/features/metric/improvement-banner/improvement-banner.component.ts +++ b/src/app/features/metric/improvement-banner/improvement-banner.component.ts @@ -1,5 +1,4 @@ import {ChangeDetectionStrategy, Component} from '@angular/core'; -import {MetricService} from '../metric.service'; import {Improvement} from '../improvement/improvement.model'; import {ImprovementService} from '../improvement/improvement.service'; diff --git a/src/app/features/metric/improvement/improvement.service.ts b/src/app/features/metric/improvement/improvement.service.ts index 86876d06d6..3741934a75 100644 --- a/src/app/features/metric/improvement/improvement.service.ts +++ b/src/app/features/metric/improvement/improvement.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@angular/core'; -import { select, Store } from '@ngrx/store'; -import { initialImprovementState, selectAllImprovements, } from './store/improvement.reducer'; +import {Injectable} from '@angular/core'; +import {select, Store} from '@ngrx/store'; +import {initialImprovementState, selectAllImprovements,} from './store/improvement.reducer'; import { AddImprovement, ClearHiddenImprovements, @@ -10,11 +10,11 @@ import { LoadImprovementState, UpdateImprovement } from './store/improvement.actions'; -import { Observable } from 'rxjs'; -import { Improvement, ImprovementState } from './improvement.model'; +import {Observable} from 'rxjs'; +import {Improvement, ImprovementState} from './improvement.model'; import shortid from 'shortid'; -import { PersistenceService } from '../../../core/persistence/persistence.service'; -import { selectLastTrackedImprovementsTomorrow } from '../store/metric.selectors'; +import {PersistenceService} from '../../../core/persistence/persistence.service'; +import {selectLastTrackedImprovementsTomorrow} from '../store/metric.selectors'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/metric/improvement/store/improvement.actions.ts b/src/app/features/metric/improvement/store/improvement.actions.ts index 9a86c0eb94..14a0434eb8 100644 --- a/src/app/features/metric/improvement/store/improvement.actions.ts +++ b/src/app/features/metric/improvement/store/improvement.actions.ts @@ -1,6 +1,6 @@ -import { Action } from '@ngrx/store'; -import { Update } from '@ngrx/entity'; -import { Improvement, ImprovementState } from '../improvement.model'; +import {Action} from '@ngrx/store'; +import {Update} from '@ngrx/entity'; +import {Improvement, ImprovementState} from '../improvement.model'; export enum ImprovementActionTypes { LoadImprovementState = '[Improvement] Load Improvement State', diff --git a/src/app/features/metric/improvement/store/improvement.effects.ts b/src/app/features/metric/improvement/store/improvement.effects.ts index c486b06f5a..a8ed1d3987 100644 --- a/src/app/features/metric/improvement/store/improvement.effects.ts +++ b/src/app/features/metric/improvement/store/improvement.effects.ts @@ -1,13 +1,13 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { map, tap, withLatestFrom } from 'rxjs/operators'; -import { select, Store } from '@ngrx/store'; -import { ClearHiddenImprovements, DeleteImprovements, ImprovementActionTypes } from './improvement.actions'; -import { selectImprovementFeatureState } from './improvement.reducer'; -import { PersistenceService } from '../../../../core/persistence/persistence.service'; -import { MetricActionTypes } from '../../store/metric.actions'; -import { selectCurrentProjectId } from '../../../project/store/project.reducer'; -import { selectUnusedImprovementIds } from '../../store/metric.selectors'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {map, tap, withLatestFrom} from 'rxjs/operators'; +import {select, Store} from '@ngrx/store'; +import {ClearHiddenImprovements, DeleteImprovements, ImprovementActionTypes} from './improvement.actions'; +import {selectImprovementFeatureState} from './improvement.reducer'; +import {PersistenceService} from '../../../../core/persistence/persistence.service'; +import {MetricActionTypes} from '../../store/metric.actions'; +import {selectCurrentProjectId} from '../../../project/store/project.reducer'; +import {selectUnusedImprovementIds} from '../../store/metric.selectors'; @Injectable() export class ImprovementEffects { diff --git a/src/app/features/metric/improvement/store/improvement.reducer.ts b/src/app/features/metric/improvement/store/improvement.reducer.ts index 7f5971a456..b011b4de13 100644 --- a/src/app/features/metric/improvement/store/improvement.reducer.ts +++ b/src/app/features/metric/improvement/store/improvement.reducer.ts @@ -1,7 +1,7 @@ -import { createEntityAdapter, EntityAdapter } from '@ngrx/entity'; -import { ImprovementActions, ImprovementActionTypes } from './improvement.actions'; -import { Improvement, ImprovementState } from '../improvement.model'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; +import {createEntityAdapter, EntityAdapter} from '@ngrx/entity'; +import {ImprovementActions, ImprovementActionTypes} from './improvement.actions'; +import {Improvement, ImprovementState} from '../improvement.model'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; export const IMPROVEMENT_FEATURE_NAME = 'improvement'; diff --git a/src/app/features/metric/metric.module.ts b/src/app/features/metric/metric.module.ts index ef72da66ac..d4032b204e 100644 --- a/src/app/features/metric/metric.module.ts +++ b/src/app/features/metric/metric.module.ts @@ -13,12 +13,6 @@ import {ObstructionModule} from './obstruction/obstruction.module'; import {ImprovementModule} from './improvement/improvement.module'; import {ChartsModule} from 'ng2-charts'; import {RouterModule} from '@angular/router'; -import {MetricService} from './metric.service'; -import {ImprovementService} from './improvement/improvement.service'; -import {ObstructionService} from './obstruction/obstruction.service'; -import {combineLatest} from 'rxjs'; -import {Metric} from './metric.model'; -import {take} from 'rxjs/operators'; @NgModule({ imports: [ diff --git a/src/app/features/metric/obstruction/obstruction.service.ts b/src/app/features/metric/obstruction/obstruction.service.ts index 1a91962265..a54fa4da3c 100644 --- a/src/app/features/metric/obstruction/obstruction.service.ts +++ b/src/app/features/metric/obstruction/obstruction.service.ts @@ -1,16 +1,17 @@ -import { Injectable } from '@angular/core'; -import { select, Store } from '@ngrx/store'; -import { initialObstructionState, selectAllObstructions } from './store/obstruction.reducer'; +import {Injectable} from '@angular/core'; +import {select, Store} from '@ngrx/store'; +import {initialObstructionState, selectAllObstructions} from './store/obstruction.reducer'; import { AddObstruction, - DeleteObstruction, DeleteObstructions, + DeleteObstruction, + DeleteObstructions, LoadObstructionState, UpdateObstruction } from './store/obstruction.actions'; -import { Observable } from 'rxjs'; -import { Obstruction, ObstructionState } from './obstruction.model'; +import {Observable} from 'rxjs'; +import {Obstruction, ObstructionState} from './obstruction.model'; import shortid from 'shortid'; -import { PersistenceService } from '../../../core/persistence/persistence.service'; +import {PersistenceService} from '../../../core/persistence/persistence.service'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/metric/obstruction/store/obstruction.effects.ts b/src/app/features/metric/obstruction/store/obstruction.effects.ts index a102155930..3fc2b9308a 100644 --- a/src/app/features/metric/obstruction/store/obstruction.effects.ts +++ b/src/app/features/metric/obstruction/store/obstruction.effects.ts @@ -1,13 +1,13 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { map, tap, withLatestFrom } from 'rxjs/operators'; -import { select, Store } from '@ngrx/store'; -import { DeleteObstructions, ObstructionActionTypes } from './obstruction.actions'; -import { selectObstructionFeatureState } from './obstruction.reducer'; -import { PersistenceService } from '../../../../core/persistence/persistence.service'; -import { selectCurrentProjectId } from '../../../project/store/project.reducer'; -import { MetricActionTypes } from '../../store/metric.actions'; -import { selectUnusedObstructionIds } from '../../store/metric.selectors'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {map, tap, withLatestFrom} from 'rxjs/operators'; +import {select, Store} from '@ngrx/store'; +import {DeleteObstructions, ObstructionActionTypes} from './obstruction.actions'; +import {selectObstructionFeatureState} from './obstruction.reducer'; +import {PersistenceService} from '../../../../core/persistence/persistence.service'; +import {selectCurrentProjectId} from '../../../project/store/project.reducer'; +import {MetricActionTypes} from '../../store/metric.actions'; +import {selectUnusedObstructionIds} from '../../store/metric.selectors'; @Injectable() export class ObstructionEffects { diff --git a/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts b/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts index dd51aca1ca..22d8dce0ee 100644 --- a/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts +++ b/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {Note} from '../note.model'; import {NoteService} from '../note.service'; import {ReminderCopy} from '../../reminder/reminder.model'; diff --git a/src/app/features/note/dialog-add-note/dialog-add-note.component.ts b/src/app/features/note/dialog-add-note/dialog-add-note.component.ts index 091123f20f..d8229fba78 100644 --- a/src/app/features/note/dialog-add-note/dialog-add-note.component.ts +++ b/src/app/features/note/dialog-add-note/dialog-add-note.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {NoteService} from '../note.service'; import {Reminder} from '../../reminder/reminder.model'; import {SS_NOTE_TMP} from '../../../core/persistence/ls-keys.const'; diff --git a/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts b/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts index 543ad304a7..9a11a40c58 100644 --- a/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts +++ b/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts @@ -1,12 +1,12 @@ -import { ChangeDetectionStrategy, Component, Inject, OnDestroy } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Reminder } from '../../reminder/reminder.model'; -import { Note } from '../note.model'; -import { NoteService } from '../note.service'; -import { Observable, Subscription } from 'rxjs'; -import { ReminderService } from '../../reminder/reminder.service'; -import { ProjectService } from '../../project/project.service'; -import { Project } from '../../project/project.model'; +import {ChangeDetectionStrategy, Component, Inject, OnDestroy} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {Reminder} from '../../reminder/reminder.model'; +import {Note} from '../note.model'; +import {NoteService} from '../note.service'; +import {Observable, Subscription} from 'rxjs'; +import {ReminderService} from '../../reminder/reminder.service'; +import {ProjectService} from '../../project/project.service'; +import {Project} from '../../project/project.model'; @Component({ selector: 'dialog-view-note-reminder', diff --git a/src/app/features/note/note.module.ts b/src/app/features/note/note.module.ts index 99bb194654..14c14ab79e 100644 --- a/src/app/features/note/note.module.ts +++ b/src/app/features/note/note.module.ts @@ -1,22 +1,17 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StoreModule } from '@ngrx/store'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {StoreModule} from '@ngrx/store'; import * as fromNote from './store/note.reducer'; -import { NOTE_FEATURE_NAME } from './store/note.reducer'; -import { EffectsModule } from '@ngrx/effects'; -import { NoteEffects } from './store/note.effects'; -import { NotesComponent } from './notes/notes.component'; -import { NoteComponent } from './note/note.component'; -import { UiModule } from '../../ui/ui.module'; -import { DialogAddNoteReminderComponent } from './dialog-add-note-reminder/dialog-add-note-reminder.component'; -import { FormsModule } from '@angular/forms'; -import { ReminderService } from '../reminder/reminder.service'; -import { MatDialog } from '@angular/material/dialog'; -import { DialogViewNoteReminderComponent } from './dialog-view-note-reminder/dialog-view-note-reminder.component'; -import { ElectronService } from 'ngx-electron'; -import { IPC_SHOW_OR_FOCUS } from '../../../../electron/ipc-events.const'; -import { IS_ELECTRON } from '../../app.constants'; -import { DialogAddNoteComponent } from './dialog-add-note/dialog-add-note.component'; +import {NOTE_FEATURE_NAME} from './store/note.reducer'; +import {EffectsModule} from '@ngrx/effects'; +import {NoteEffects} from './store/note.effects'; +import {NotesComponent} from './notes/notes.component'; +import {NoteComponent} from './note/note.component'; +import {UiModule} from '../../ui/ui.module'; +import {DialogAddNoteReminderComponent} from './dialog-add-note-reminder/dialog-add-note-reminder.component'; +import {FormsModule} from '@angular/forms'; +import {DialogViewNoteReminderComponent} from './dialog-view-note-reminder/dialog-view-note-reminder.component'; +import {DialogAddNoteComponent} from './dialog-add-note/dialog-add-note.component'; @NgModule({ imports: [ @@ -40,4 +35,5 @@ import { DialogAddNoteComponent } from './dialog-add-note/dialog-add-note.compon ], exports: [NotesComponent], }) -export class NoteModule {} +export class NoteModule { +} diff --git a/src/app/features/note/note.service.ts b/src/app/features/note/note.service.ts index 276520c047..f54d17b565 100644 --- a/src/app/features/note/note.service.ts +++ b/src/app/features/note/note.service.ts @@ -1,7 +1,7 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { Note } from './note.model'; -import { select, Store } from '@ngrx/store'; +import {Injectable} from '@angular/core'; +import {Observable} from 'rxjs'; +import {Note} from './note.model'; +import {select, Store} from '@ngrx/store'; import { AddNote, AddNoteReminder, @@ -16,13 +16,13 @@ import { UpdateNoteReminder } from './store/note.actions'; import shortid from 'shortid'; -import { initialNoteState, NoteState, selectAllNotes, selectIsShowNotes, selectNoteById } from './store/note.reducer'; -import { PersistenceService } from '../../core/persistence/persistence.service'; -import { Actions, ofType } from '@ngrx/effects'; -import { take } from 'rxjs/operators'; -import { SnackService } from '../../core/snack/snack.service'; -import { createFromDrop, DropPasteInput } from '../../core/drop-paste-input/drop-paste-input'; -import { isImageUrl, isImageUrlSimple } from '../../util/is-image-url'; +import {initialNoteState, NoteState, selectAllNotes, selectIsShowNotes, selectNoteById} from './store/note.reducer'; +import {PersistenceService} from '../../core/persistence/persistence.service'; +import {Actions, ofType} from '@ngrx/effects'; +import {take} from 'rxjs/operators'; +import {SnackService} from '../../core/snack/snack.service'; +import {createFromDrop, DropPasteInput} from '../../core/drop-paste-input/drop-paste-input'; +import {isImageUrl, isImageUrlSimple} from '../../util/is-image-url'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/note/note/note.component.ts b/src/app/features/note/note/note.component.ts index 34108734cc..713eab252c 100644 --- a/src/app/features/note/note/note.component.ts +++ b/src/app/features/note/note/note.component.ts @@ -1,8 +1,8 @@ -import { ChangeDetectionStrategy, Component, Input, ViewChild } from '@angular/core'; -import { Note } from '../note.model'; -import { NoteService } from '../note.service'; -import { MatDialog } from '@angular/material/dialog'; -import { DialogAddNoteReminderComponent } from '../dialog-add-note-reminder/dialog-add-note-reminder.component'; +import {ChangeDetectionStrategy, Component, Input, ViewChild} from '@angular/core'; +import {Note} from '../note.model'; +import {NoteService} from '../note.service'; +import {MatDialog} from '@angular/material/dialog'; +import {DialogAddNoteReminderComponent} from '../dialog-add-note-reminder/dialog-add-note-reminder.component'; @Component({ selector: 'note', @@ -14,7 +14,7 @@ export class NoteComponent { @Input() note: Note; @Input() isFocus: boolean; - @ViewChild('markdownEl', { static: false }) markdownEl: HTMLElement; + @ViewChild('markdownEl', {static: false}) markdownEl: HTMLElement; constructor( private readonly _matDialog: MatDialog, diff --git a/src/app/features/note/notes/notes.component.ts b/src/app/features/note/notes/notes.component.ts index 35321a4524..7c5896adb3 100644 --- a/src/app/features/note/notes/notes.component.ts +++ b/src/app/features/note/notes/notes.component.ts @@ -1,13 +1,13 @@ -import { ChangeDetectionStrategy, Component, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { NoteService } from '../note.service'; -import { DragulaService } from 'ng2-dragula'; -import { Subscription } from 'rxjs'; -import { MatButton } from '@angular/material/button'; -import { MatDialog } from '@angular/material/dialog'; -import { DialogAddNoteComponent } from '../dialog-add-note/dialog-add-note.component'; -import { standardListAnimation } from '../../../ui/animations/standard-list.ani'; -import { fadeAnimation } from '../../../ui/animations/fade.ani'; -import { Note } from '../note.model'; +import {ChangeDetectionStrategy, Component, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import {NoteService} from '../note.service'; +import {DragulaService} from 'ng2-dragula'; +import {Subscription} from 'rxjs'; +import {MatButton} from '@angular/material/button'; +import {MatDialog} from '@angular/material/dialog'; +import {DialogAddNoteComponent} from '../dialog-add-note/dialog-add-note.component'; +import {standardListAnimation} from '../../../ui/animations/standard-list.ani'; +import {fadeAnimation} from '../../../ui/animations/fade.ani'; +import {Note} from '../note.model'; @Component({ selector: 'notes', @@ -22,7 +22,7 @@ export class NotesComponent implements OnInit, OnDestroy { isDragOver = false; dragEnterTarget: HTMLElement; - @ViewChild('buttonEl', { static: true }) buttonEl: MatButton; + @ViewChild('buttonEl', {static: true}) buttonEl: MatButton; private _subs = new Subscription(); constructor( diff --git a/src/app/features/note/store/note.actions.ts b/src/app/features/note/store/note.actions.ts index aaf25d92a9..b12523b5cd 100644 --- a/src/app/features/note/store/note.actions.ts +++ b/src/app/features/note/store/note.actions.ts @@ -1,7 +1,7 @@ -import { Action } from '@ngrx/store'; -import { Update } from '@ngrx/entity'; -import { Note } from '../note.model'; -import { NoteState } from './note.reducer'; +import {Action} from '@ngrx/store'; +import {Update} from '@ngrx/entity'; +import {Note} from '../note.model'; +import {NoteState} from './note.reducer'; export enum NoteActionTypes { LoadNoteState = '[Note] Load Note State', diff --git a/src/app/features/note/store/note.effects.ts b/src/app/features/note/store/note.effects.ts index 927bdd1aa8..790d4fb6ad 100644 --- a/src/app/features/note/store/note.effects.ts +++ b/src/app/features/note/store/note.effects.ts @@ -1,9 +1,9 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { PersistenceService } from '../../../core/persistence/persistence.service'; -import { select, Store } from '@ngrx/store'; -import { filter, map, mergeMap, tap, withLatestFrom } from 'rxjs/operators'; -import { selectCurrentProjectId } from '../../project/store/project.reducer'; +import {Injectable} from '@angular/core'; +import {Actions, Effect, ofType} from '@ngrx/effects'; +import {PersistenceService} from '../../../core/persistence/persistence.service'; +import {select, Store} from '@ngrx/store'; +import {filter, map, mergeMap, tap, withLatestFrom} from 'rxjs/operators'; +import {selectCurrentProjectId} from '../../project/store/project.reducer'; import { AddNote, AddNoteReminder, @@ -13,9 +13,9 @@ import { UpdateNote, UpdateNoteReminder } from './note.actions'; -import { selectNoteFeatureState } from './note.reducer'; -import { ReminderService } from '../../reminder/reminder.service'; -import { SnackOpen } from '../../../core/snack/store/snack.actions'; +import {selectNoteFeatureState} from './note.reducer'; +import {ReminderService} from '../../reminder/reminder.service'; +import {SnackOpen} from '../../../core/snack/store/snack.actions'; @Injectable() export class NoteEffects { diff --git a/src/app/features/note/store/note.reducer.ts b/src/app/features/note/store/note.reducer.ts index 320b330a0d..4cb5c16c74 100644 --- a/src/app/features/note/store/note.reducer.ts +++ b/src/app/features/note/store/note.reducer.ts @@ -1,7 +1,7 @@ -import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity'; -import { Note } from '../note.model'; -import { NoteActions, NoteActionTypes } from './note.actions'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; +import {createEntityAdapter, EntityAdapter, EntityState} from '@ngrx/entity'; +import {Note} from '../note.model'; +import {NoteActions, NoteActionTypes} from './note.actions'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; export interface NoteState extends EntityState { // additional entities state properties diff --git a/src/app/features/planning-mode/planning-mode.service.ts b/src/app/features/planning-mode/planning-mode.service.ts index a5cc7a41ac..a6b1108f0e 100644 --- a/src/app/features/planning-mode/planning-mode.service.ts +++ b/src/app/features/planning-mode/planning-mode.service.ts @@ -1,8 +1,8 @@ -import { Injectable } from '@angular/core'; -import { BehaviorSubject, merge, Observable } from 'rxjs'; -import { TaskService } from '../tasks/task.service'; -import { delay, map, withLatestFrom } from 'rxjs/operators'; -import { ProjectService } from '../project/project.service'; +import {Injectable} from '@angular/core'; +import {BehaviorSubject, merge, Observable} from 'rxjs'; +import {TaskService} from '../tasks/task.service'; +import {delay, map, withLatestFrom} from 'rxjs/operators'; +import {ProjectService} from '../project/project.service'; @Injectable({ providedIn: 'root' diff --git a/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts b/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts index 6f079b0664..6b49c348e5 100644 --- a/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts +++ b/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts @@ -1,8 +1,8 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; -import { PomodoroService } from '../pomodoro.service'; -import { filter, mapTo, takeUntil, withLatestFrom } from 'rxjs/operators'; -import { Observable, Subject, Subscription } from 'rxjs'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; +import {MatDialogRef} from '@angular/material/dialog'; +import {PomodoroService} from '../pomodoro.service'; +import {filter, mapTo, takeUntil, withLatestFrom} from 'rxjs/operators'; +import {Observable, Subject, Subscription} from 'rxjs'; @Component({ selector: 'dialog-pomodoro-break', diff --git a/src/app/features/pomodoro/pomodoro.module.ts b/src/app/features/pomodoro/pomodoro.module.ts index d2430dadf3..d489ab463d 100644 --- a/src/app/features/pomodoro/pomodoro.module.ts +++ b/src/app/features/pomodoro/pomodoro.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; -import { PomodoroEffects } from './store/pomodoro.effects'; -import { POMODORO_FEATURE_NAME, pomodoroReducer } from './store/pomodoro.reducer'; -import { DialogPomodoroBreakComponent } from './dialog-pomodoro-break/dialog-pomodoro-break.component'; -import { UiModule } from '../../ui/ui.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {StoreModule} from '@ngrx/store'; +import {EffectsModule} from '@ngrx/effects'; +import {PomodoroEffects} from './store/pomodoro.effects'; +import {POMODORO_FEATURE_NAME, pomodoroReducer} from './store/pomodoro.reducer'; +import {DialogPomodoroBreakComponent} from './dialog-pomodoro-break/dialog-pomodoro-break.component'; +import {UiModule} from '../../ui/ui.module'; @NgModule({ declarations: [DialogPomodoroBreakComponent], diff --git a/src/app/features/pomodoro/store/pomodoro.actions.ts b/src/app/features/pomodoro/store/pomodoro.actions.ts index 362a104d27..bc0e45d2e4 100644 --- a/src/app/features/pomodoro/store/pomodoro.actions.ts +++ b/src/app/features/pomodoro/store/pomodoro.actions.ts @@ -1,4 +1,4 @@ -import { Action } from '@ngrx/store'; +import {Action} from '@ngrx/store'; export enum PomodoroActionTypes { StartPomodoro = '[Pomodoro] Start Pomodoro', diff --git a/src/app/features/pomodoro/store/pomodoro.reducer.ts b/src/app/features/pomodoro/store/pomodoro.reducer.ts index 69ec799ad6..352b783c1f 100644 --- a/src/app/features/pomodoro/store/pomodoro.reducer.ts +++ b/src/app/features/pomodoro/store/pomodoro.reducer.ts @@ -1,5 +1,5 @@ -import { PomodoroActions, PomodoroActionTypes } from './pomodoro.actions'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; +import {PomodoroActions, PomodoroActionTypes} from './pomodoro.actions'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; export const POMODORO_FEATURE_NAME = 'pomodoro'; diff --git a/src/app/features/procrastination/procrastination.component.spec.ts b/src/app/features/procrastination/procrastination.component.spec.ts index 0de499887e..5449089908 100644 --- a/src/app/features/procrastination/procrastination.component.spec.ts +++ b/src/app/features/procrastination/procrastination.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { ProcrastinationComponent } from './procrastination.component'; +import {ProcrastinationComponent} from './procrastination.component'; describe('ProcrastinationComponent', () => { let component: ProcrastinationComponent; @@ -8,9 +8,9 @@ describe('ProcrastinationComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ProcrastinationComponent ] + declarations: [ProcrastinationComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/features/procrastination/procrastination.component.ts b/src/app/features/procrastination/procrastination.component.ts index 4dea5d6633..339dce17a9 100644 --- a/src/app/features/procrastination/procrastination.component.ts +++ b/src/app/features/procrastination/procrastination.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; +import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; import {TaskService} from '../tasks/task.service'; @Component({ @@ -11,7 +11,8 @@ export class ProcrastinationComponent implements OnInit { constructor( public taskService: TaskService, - ) { } + ) { + } ngOnInit() { } diff --git a/src/app/features/project/project-form-cfg.const.ts b/src/app/features/project/project-form-cfg.const.ts index 2f719e1697..1a89cebe4f 100644 --- a/src/app/features/project/project-form-cfg.const.ts +++ b/src/app/features/project/project-form-cfg.const.ts @@ -1,5 +1,5 @@ -import { ConfigFormConfig, ConfigFormSection } from '../config/global-config.model'; -import { ALL_THEMES } from '../../app.constants'; +import {ConfigFormConfig, ConfigFormSection} from '../config/global-config.model'; +import {ALL_THEMES} from '../../app.constants'; const themeOpts = ALL_THEMES.map((theme) => { return {label: theme, value: theme}; diff --git a/src/app/features/project/project.model.ts b/src/app/features/project/project.model.ts index fca3605a26..7e538e0e3c 100644 --- a/src/app/features/project/project.model.ts +++ b/src/app/features/project/project.model.ts @@ -1,13 +1,13 @@ -import { IssueIntegrationCfgs, IssueProviderKey, IssueStateMap } from '../issue/issue'; -import { NoteState } from '../note/store/note.reducer'; -import { BookmarkState } from '../bookmark/store/bookmark.reducer'; -import { TaskState } from '../tasks/store/task.reducer'; -import { EntityState } from '@ngrx/entity'; -import { Task } from '../tasks/task.model'; -import { Attachment } from '../attachment/attachment.model'; -import { MetricState } from '../metric/metric.model'; -import { ImprovementState } from '../metric/improvement/improvement.model'; -import { ObstructionState } from '../metric/obstruction/obstruction.model'; +import {IssueIntegrationCfgs, IssueProviderKey, IssueStateMap} from '../issue/issue'; +import {NoteState} from '../note/store/note.reducer'; +import {BookmarkState} from '../bookmark/store/bookmark.reducer'; +import {TaskState} from '../tasks/store/task.reducer'; +import {EntityState} from '@ngrx/entity'; +import {Task} from '../tasks/task.model'; +import {Attachment} from '../attachment/attachment.model'; +import {MetricState} from '../metric/metric.model'; +import {ImprovementState} from '../metric/improvement/improvement.model'; +import {ObstructionState} from '../metric/obstruction/obstruction.model'; export type RoundTimeOption = '5M' | 'QUARTER' | 'HALF' | 'HOUR'; diff --git a/src/app/features/project/project.module.ts b/src/app/features/project/project.module.ts index 4675671260..a688825937 100644 --- a/src/app/features/project/project.module.ts +++ b/src/app/features/project/project.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StoreModule } from '@ngrx/store'; -import { PROJECT_FEATURE_NAME, projectReducer } from './store/project.reducer'; -import { EffectsModule } from '@ngrx/effects'; -import { ProjectEffects } from './store/project.effects'; -import { ProjectService } from './project.service'; -import { DialogCreateProjectComponent } from './dialogs/create-project/dialog-create-project.component'; -import { UiModule } from '../../ui/ui.module'; -import { JiraModule } from '../issue/jira/jira.module'; -import { GithubModule } from '../issue/github/github.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {StoreModule} from '@ngrx/store'; +import {PROJECT_FEATURE_NAME, projectReducer} from './store/project.reducer'; +import {EffectsModule} from '@ngrx/effects'; +import {ProjectEffects} from './store/project.effects'; +import {ProjectService} from './project.service'; +import {DialogCreateProjectComponent} from './dialogs/create-project/dialog-create-project.component'; +import {UiModule} from '../../ui/ui.module'; +import {JiraModule} from '../issue/jira/jira.module'; +import {GithubModule} from '../issue/github/github.module'; @NgModule({ imports: [ diff --git a/src/app/features/project/project.service.ts b/src/app/features/project/project.service.ts index 3bb59451a8..d291a5dae2 100644 --- a/src/app/features/project/project.service.ts +++ b/src/app/features/project/project.service.ts @@ -30,9 +30,9 @@ import { selectProjectBreakTime, selectProjectBreakTimeForDay, selectProjectById, - selectProjectLastCompletedDay, selectProjectGithubCfg, selectProjectJiraCfg, + selectProjectLastCompletedDay, selectProjectLastWorkEnd, selectProjectWorkEndForDay, selectProjectWorkStartForDay, diff --git a/src/app/features/project/store/project.actions.ts b/src/app/features/project/store/project.actions.ts index a33d0873ec..518a5e6612 100644 --- a/src/app/features/project/store/project.actions.ts +++ b/src/app/features/project/store/project.actions.ts @@ -94,6 +94,7 @@ export class UpdateProjectWorkEnd implements Action { constructor(public payload: { id: string; date: string; newVal: number; }) { } } + export class UpdateLastCompletedDay implements Action { readonly type = ProjectActionTypes.UpdateLastCompletedDay; diff --git a/src/app/features/project/store/project.reducer.ts b/src/app/features/project/store/project.reducer.ts index 1c336005ba..62ff48920f 100644 --- a/src/app/features/project/store/project.reducer.ts +++ b/src/app/features/project/store/project.reducer.ts @@ -186,7 +186,7 @@ export function projectReducer( case ProjectActionTypes.UpdateLastCompletedDay: { const {id, date} = action.payload; - console.log(id,date); + console.log(id, date); return projectAdapter.updateOne({ id, changes: { diff --git a/src/app/features/reminder/reminder.module.ts b/src/app/features/reminder/reminder.module.ts index 34f385b544..c11ede441f 100644 --- a/src/app/features/reminder/reminder.module.ts +++ b/src/app/features/reminder/reminder.module.ts @@ -1,16 +1,16 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ReminderService } from './reminder.service'; -import { NoteModule } from '../note/note.module'; -import { MatDialog } from '@angular/material/dialog'; -import { ElectronService } from 'ngx-electron'; -import { IS_ELECTRON } from '../../app.constants'; -import { IPC_SHOW_OR_FOCUS } from '../../../../electron/ipc-events.const'; -import { DialogViewNoteReminderComponent } from '../note/dialog-view-note-reminder/dialog-view-note-reminder.component'; -import { TasksModule } from '../tasks/tasks.module'; -import { DialogViewTaskReminderComponent } from '../tasks/dialog-view-task-reminder/dialog-view-task-reminder.component'; -import { filter } from 'rxjs/operators'; -import { Reminder } from './reminder.model'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {ReminderService} from './reminder.service'; +import {NoteModule} from '../note/note.module'; +import {MatDialog} from '@angular/material/dialog'; +import {ElectronService} from 'ngx-electron'; +import {IS_ELECTRON} from '../../app.constants'; +import {IPC_SHOW_OR_FOCUS} from '../../../../electron/ipc-events.const'; +import {DialogViewNoteReminderComponent} from '../note/dialog-view-note-reminder/dialog-view-note-reminder.component'; +import {TasksModule} from '../tasks/tasks.module'; +import {DialogViewTaskReminderComponent} from '../tasks/dialog-view-task-reminder/dialog-view-task-reminder.component'; +import {filter} from 'rxjs/operators'; +import {Reminder} from './reminder.model'; @NgModule({ declarations: [], diff --git a/src/app/features/simple-task-export/dialog-simple-task-export/dialog-simple-task-export.component.ts b/src/app/features/simple-task-export/dialog-simple-task-export/dialog-simple-task-export.component.ts index 9ac941d9b4..51883be26a 100644 --- a/src/app/features/simple-task-export/dialog-simple-task-export/dialog-simple-task-export.component.ts +++ b/src/app/features/simple-task-export/dialog-simple-task-export/dialog-simple-task-export.component.ts @@ -1,7 +1,7 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { SimpleSummarySettingsCopy } from '../../project/project.model'; -import { SIMPLE_SUMMARY_DEFAULTS } from '../../project/project.const'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {SimpleSummarySettingsCopy} from '../../project/project.model'; +import {SIMPLE_SUMMARY_DEFAULTS} from '../../project/project.const'; @Component({ selector: 'dialog-simple-task-export', diff --git a/src/app/features/simple-task-export/simple-task-export.module.ts b/src/app/features/simple-task-export/simple-task-export.module.ts index 8d823112fc..6f74c4f58f 100644 --- a/src/app/features/simple-task-export/simple-task-export.module.ts +++ b/src/app/features/simple-task-export/simple-task-export.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { DialogSimpleTaskExportComponent } from './dialog-simple-task-export/dialog-simple-task-export.component'; -import { UiModule } from '../../ui/ui.module'; -import { FormsModule } from '@angular/forms'; -import { SimpleTaskExportComponent } from './simple-task-export/simple-task-export.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {DialogSimpleTaskExportComponent} from './dialog-simple-task-export/dialog-simple-task-export.component'; +import {UiModule} from '../../ui/ui.module'; +import {FormsModule} from '@angular/forms'; +import {SimpleTaskExportComponent} from './simple-task-export/simple-task-export.component'; @NgModule({ imports: [ diff --git a/src/app/features/simple-task-export/simple-task-export/simple-task-export.component.ts b/src/app/features/simple-task-export/simple-task-export/simple-task-export.component.ts index 134e5cd126..50b0c44259 100644 --- a/src/app/features/simple-task-export/simple-task-export/simple-task-export.component.ts +++ b/src/app/features/simple-task-export/simple-task-export/simple-task-export.component.ts @@ -1,16 +1,16 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { msToString } from '../../../ui/duration/ms-to-string.pipe'; -import { TaskWithSubTasks } from '../../tasks/task.model'; -import { ProjectService } from '../../project/project.service'; -import { Subscription } from 'rxjs'; -import { SimpleSummarySettingsCopy } from '../../project/project.model'; -import { SIMPLE_SUMMARY_DEFAULTS } from '../../project/project.const'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core'; +import {msToString} from '../../../ui/duration/ms-to-string.pipe'; +import {TaskWithSubTasks} from '../../tasks/task.model'; +import {ProjectService} from '../../project/project.service'; +import {Subscription} from 'rxjs'; +import {SimpleSummarySettingsCopy} from '../../project/project.model'; +import {SIMPLE_SUMMARY_DEFAULTS} from '../../project/project.const'; import Clipboard from 'clipboard'; -import { SnackService } from '../../../core/snack/snack.service'; -import { getWorklogStr } from '../../../util/get-work-log-str'; +import {SnackService} from '../../../core/snack/snack.service'; +import {getWorklogStr} from '../../../util/get-work-log-str'; import * as moment from 'moment-mini'; import 'moment-duration-format'; -import { roundDuration } from '../../../util/round-duration'; +import {roundDuration} from '../../../util/round-duration'; const LINE_SEPARATOR = '\n'; diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts index 45cc573074..58e03838f4 100644 --- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts +++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { DialogEditTaskRepeatCfgComponent } from './dialog-edit-task-repeat-cfg.component'; +import {DialogEditTaskRepeatCfgComponent} from './dialog-edit-task-repeat-cfg.component'; describe('DialogEditTaskRepeatCfgComponent', () => { let component: DialogEditTaskRepeatCfgComponent; @@ -8,9 +8,9 @@ describe('DialogEditTaskRepeatCfgComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ DialogEditTaskRepeatCfgComponent ] + declarations: [DialogEditTaskRepeatCfgComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts index 370d63f7b3..6e9a2ccb79 100644 --- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts +++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts @@ -5,7 +5,7 @@ import {SnackService} from '../../../core/snack/snack.service'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material'; import {TaskRepeatCfgService} from '../task-repeat-cfg.service'; import {DEFAULT_TASK_REPEAT_CFG, TaskRepeatCfgCopy} from '../task-repeat-cfg.model'; -import {Observable, Subscription} from 'rxjs'; +import {Subscription} from 'rxjs'; import {FormlyFieldConfig, FormlyFormOptions} from '@ngx-formly/core'; import {FormGroup} from '@angular/forms'; import {TASK_REPEAT_CFG_FORM_CFG} from './task-repeat-cfg-form.const'; diff --git a/src/app/features/task-repeat-cfg/store/task-repeat-cfg.effects.ts b/src/app/features/task-repeat-cfg/store/task-repeat-cfg.effects.ts index 0d2617c27d..71e13c0816 100644 --- a/src/app/features/task-repeat-cfg/store/task-repeat-cfg.effects.ts +++ b/src/app/features/task-repeat-cfg/store/task-repeat-cfg.effects.ts @@ -9,7 +9,6 @@ import { UpdateTaskRepeatCfg } from './task-repeat-cfg.actions'; import {selectTaskRepeatCfgFeatureState} from './task-repeat-cfg.reducer'; -import {selectCurrentProjectId} from '../../project/store/project.reducer'; import {PersistenceService} from '../../../core/persistence/persistence.service'; import {Task, TaskArchive, TaskWithSubTasks} from '../../tasks/task.model'; import {AddTask, MoveToArchive, RemoveTaskReminder, UpdateTask} from '../../tasks/store/task.actions'; @@ -128,7 +127,7 @@ export class TaskRepeatCfgEffects { TaskRepeatCfgActionTypes.DeleteTaskRepeatCfg, ), withLatestFrom( - this._projectService.currentId$, + this._projectService.currentId$, ), tap(([a, projectId]: [DeleteTaskRepeatCfg, string]) => { this._removeRepeatCfgFromArchiveTasks.bind(this)(a.payload.id, projectId); diff --git a/src/app/features/task-repeat-cfg/store/task-repeat-cfg.reducer.ts b/src/app/features/task-repeat-cfg/store/task-repeat-cfg.reducer.ts index 37e2f4ddef..059f0763e8 100644 --- a/src/app/features/task-repeat-cfg/store/task-repeat-cfg.reducer.ts +++ b/src/app/features/task-repeat-cfg/store/task-repeat-cfg.reducer.ts @@ -1,7 +1,7 @@ -import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity'; -import { TaskRepeatCfgActions, TaskRepeatCfgActionTypes } from './task-repeat-cfg.actions'; -import { TaskRepeatCfg, TaskRepeatCfgState } from '../task-repeat-cfg.model'; -import { createFeatureSelector, createSelector } from '@ngrx/store'; +import {createEntityAdapter, EntityAdapter} from '@ngrx/entity'; +import {TaskRepeatCfgActions, TaskRepeatCfgActionTypes} from './task-repeat-cfg.actions'; +import {TaskRepeatCfg, TaskRepeatCfgState} from '../task-repeat-cfg.model'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; export const TASK_REPEAT_CFG_FEATURE_NAME = 'taskRepeatCfg'; @@ -17,41 +17,41 @@ export const selectTaskRepeatCfgById = createSelector( export const initialTaskRepeatCfgState: TaskRepeatCfgState = adapter.getInitialState({ - // additional entity state properties + // additional entity state properties }); export function taskRepeatCfgReducer( - state = initialTaskRepeatCfgState, - action: TaskRepeatCfgActions + state = initialTaskRepeatCfgState, + action: TaskRepeatCfgActions ): TaskRepeatCfgState { - switch (action.type) { - case TaskRepeatCfgActionTypes.AddTaskRepeatCfgToTask: { - return adapter.addOne(action.payload.taskRepeatCfg, state); - } - - case TaskRepeatCfgActionTypes.UpdateTaskRepeatCfg: { - return adapter.updateOne(action.payload.taskRepeatCfg, state); - } - - case TaskRepeatCfgActionTypes.UpsertTaskRepeatCfg: { - return adapter.upsertOne(action.payload.taskRepeatCfg, state); - } - - case TaskRepeatCfgActionTypes.DeleteTaskRepeatCfg: { - return adapter.removeOne(action.payload.id, state); - } - - case TaskRepeatCfgActionTypes.DeleteTaskRepeatCfgs: { - return adapter.removeMany(action.payload.ids, state); - } - - case TaskRepeatCfgActionTypes.LoadTaskRepeatCfgState: - return {...action.payload.state}; - - default: { - return state; - } + switch (action.type) { + case TaskRepeatCfgActionTypes.AddTaskRepeatCfgToTask: { + return adapter.addOne(action.payload.taskRepeatCfg, state); } + + case TaskRepeatCfgActionTypes.UpdateTaskRepeatCfg: { + return adapter.updateOne(action.payload.taskRepeatCfg, state); + } + + case TaskRepeatCfgActionTypes.UpsertTaskRepeatCfg: { + return adapter.upsertOne(action.payload.taskRepeatCfg, state); + } + + case TaskRepeatCfgActionTypes.DeleteTaskRepeatCfg: { + return adapter.removeOne(action.payload.id, state); + } + + case TaskRepeatCfgActionTypes.DeleteTaskRepeatCfgs: { + return adapter.removeMany(action.payload.ids, state); + } + + case TaskRepeatCfgActionTypes.LoadTaskRepeatCfgState: + return {...action.payload.state}; + + default: { + return state; + } + } } diff --git a/src/app/features/tasks/add-task-bar/add-task-bar.component.ts b/src/app/features/tasks/add-task-bar/add-task-bar.component.ts index fa27236140..2d7ec4ed20 100644 --- a/src/app/features/tasks/add-task-bar/add-task-bar.component.ts +++ b/src/app/features/tasks/add-task-bar/add-task-bar.component.ts @@ -8,17 +8,17 @@ import { Output, ViewChild } from '@angular/core'; -import { FormControl } from '@angular/forms'; -import { TaskService } from '../task.service'; -import { debounceTime, switchMap, tap } from 'rxjs/operators'; -import { JiraIssue } from '../../issue/jira/jira-issue/jira-issue.model'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { IssueService } from '../../issue/issue.service'; -import { SearchResultItem } from '../../issue/issue'; -import { SnackService } from '../../../core/snack/snack.service'; -import { JiraApiService } from '../../issue/jira/jira-api.service'; -import { JIRA_TYPE } from '../../issue/issue.const'; -import { truncate } from '../../../util/truncate'; +import {FormControl} from '@angular/forms'; +import {TaskService} from '../task.service'; +import {debounceTime, switchMap, tap} from 'rxjs/operators'; +import {JiraIssue} from '../../issue/jira/jira-issue/jira-issue.model'; +import {BehaviorSubject, Observable} from 'rxjs'; +import {IssueService} from '../../issue/issue.service'; +import {SearchResultItem} from '../../issue/issue'; +import {SnackService} from '../../../core/snack/snack.service'; +import {JiraApiService} from '../../issue/jira/jira-api.service'; +import {JIRA_TYPE} from '../../issue/issue.const'; +import {truncate} from '../../../util/truncate'; @Component({ selector: 'add-task-bar', @@ -33,7 +33,7 @@ export class AddTaskBarComponent implements AfterViewInit, OnDestroy { @Output() blur: EventEmitter = new EventEmitter(); @Output() done: EventEmitter = new EventEmitter(); - @ViewChild('inputEl', { static: true }) inputEl; + @ViewChild('inputEl', {static: true}) inputEl; isLoading$ = new BehaviorSubject(false); doubleEnterCount = 0; diff --git a/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts b/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts index 2ff06feaa1..4385166e6e 100644 --- a/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts +++ b/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Task } from '../task.model'; -import { TaskService } from '../task.service'; -import { ReminderCopy } from '../../reminder/reminder.model'; -import { ReminderService } from '../../reminder/reminder.service'; -import { SnackService } from '../../../core/snack/snack.service'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {Task} from '../task.model'; +import {TaskService} from '../task.service'; +import {ReminderCopy} from '../../reminder/reminder.model'; +import {ReminderService} from '../../reminder/reminder.service'; +import {SnackService} from '../../../core/snack/snack.service'; @Component({ selector: 'dialog-add-task-reminder', diff --git a/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts b/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts index 42c1802356..30fa1c21b0 100644 --- a/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts +++ b/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Task, TaskCopy, TimeSpentOnDayCopy } from '../task.model'; -import { TaskService } from '../task.service'; -import { getTodayStr } from '../util/get-today-str'; -import { getWorklogStr } from '../../../util/get-work-log-str'; -import { createTaskCopy } from '../util/create-task-copy'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {Task, TaskCopy, TimeSpentOnDayCopy} from '../task.model'; +import {TaskService} from '../task.service'; +import {getTodayStr} from '../util/get-today-str'; +import {getWorklogStr} from '../../../util/get-work-log-str'; +import {createTaskCopy} from '../util/create-task-copy'; interface NewTimeEntry { timeSpent: number; diff --git a/src/app/features/tasks/filter-done-tasks.pipe.ts b/src/app/features/tasks/filter-done-tasks.pipe.ts index d4a9cef9dd..22ce3a0848 100644 --- a/src/app/features/tasks/filter-done-tasks.pipe.ts +++ b/src/app/features/tasks/filter-done-tasks.pipe.ts @@ -1,5 +1,5 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { TaskWithSubTasks } from './task.model'; +import {Pipe, PipeTransform} from '@angular/core'; +import {TaskWithSubTasks} from './task.model'; export const filterDoneTasks = (tasks: TaskWithSubTasks[], currentTaskId: string, isFilterDone: boolean, isFilterAll: boolean): any => { return isFilterDone diff --git a/src/app/features/tasks/select-task/select-task.component.ts b/src/app/features/tasks/select-task/select-task.component.ts index d76c8200f9..abc1f7cfb4 100644 --- a/src/app/features/tasks/select-task/select-task.component.ts +++ b/src/app/features/tasks/select-task/select-task.component.ts @@ -1,9 +1,9 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { FormControl } from '@angular/forms'; -import { Task } from '../task.model'; -import { map, startWith, takeUntil, withLatestFrom } from 'rxjs/operators'; -import { TaskService } from '../task.service'; -import { Subject } from 'rxjs'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core'; +import {FormControl} from '@angular/forms'; +import {Task} from '../task.model'; +import {map, startWith, takeUntil, withLatestFrom} from 'rxjs/operators'; +import {TaskService} from '../task.service'; +import {Subject} from 'rxjs'; @Component({ selector: 'select-task', diff --git a/src/app/features/tasks/task-additional-info/task-additional-info.component.html b/src/app/features/tasks/task-additional-info/task-additional-info.component.html index 61fc4eaa36..a582a13bd2 100644 --- a/src/app/features/tasks/task-additional-info/task-additional-info.component.html +++ b/src/app/features/tasks/task-additional-info/task-additional-info.component.html @@ -25,7 +25,8 @@ attachment - Attachments({{issueAttachments?.length + (localAttachments$|async)?.length}}) + Attachments({{issueAttachments?.length + (localAttachments$|async)?.length}} + )
diff --git a/src/app/features/tasks/task-additional-info/task-additional-info.component.scss b/src/app/features/tasks/task-additional-info/task-additional-info.component.scss index 3e9dbbe728..c2e2c80c05 100644 --- a/src/app/features/tasks/task-additional-info/task-additional-info.component.scss +++ b/src/app/features/tasks/task-additional-info/task-additional-info.component.scss @@ -36,7 +36,7 @@ // @see https://github.com/angular/angular/issues/19199 .isDarkTheme .isCurrent :host-context &, :host-context(.isDarkTheme .isCurrent) & { - border-color: #333333 ; + border-color: #333333; } :host-context(.isReducedTheme) & { diff --git a/src/app/features/tasks/task-additional-info/task-additional-info.component.ts b/src/app/features/tasks/task-additional-info/task-additional-info.component.ts index 74dde7bc8e..5edf663eea 100644 --- a/src/app/features/tasks/task-additional-info/task-additional-info.component.ts +++ b/src/app/features/tasks/task-additional-info/task-additional-info.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectionStrategy, Component, ComponentFactoryResolver, EventEmitter, Input, Output } from '@angular/core'; -import { TaskWithSubTasks } from '../task.model'; -import { IssueService } from '../../issue/issue.service'; -import { AttachmentService } from '../../attachment/attachment.service'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { Attachment } from '../../attachment/attachment.model'; -import { switchMap } from 'rxjs/operators'; +import {ChangeDetectionStrategy, Component, ComponentFactoryResolver, EventEmitter, Input, Output} from '@angular/core'; +import {TaskWithSubTasks} from '../task.model'; +import {IssueService} from '../../issue/issue.service'; +import {AttachmentService} from '../../attachment/attachment.service'; +import {BehaviorSubject, Observable} from 'rxjs'; +import {Attachment} from '../../attachment/attachment.model'; +import {switchMap} from 'rxjs/operators'; @Component({ selector: 'task-additional-info', diff --git a/src/app/features/tasks/task-list/task-list.component.html b/src/app/features/tasks/task-list/task-list.component.html index 4a93576fb3..afb75958c9 100644 --- a/src/app/features/tasks/task-list/task-list.component.html +++ b/src/app/features/tasks/task-list/task-list.component.html @@ -20,4 +20,4 @@
{{noTasksMsg}}
+ class="no-tasks">{{noTasksMsg}} diff --git a/src/app/features/tasks/task-list/task-list.component.ts b/src/app/features/tasks/task-list/task-list.component.ts index e3d7709bb9..3cf52f1615 100644 --- a/src/app/features/tasks/task-list/task-list.component.ts +++ b/src/app/features/tasks/task-list/task-list.component.ts @@ -1,12 +1,20 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { Task, TaskWithSubTasks } from '../task.model'; -import { TaskService } from '../task.service'; -import { DragulaService } from 'ng2-dragula'; -import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; -import { standardListAnimation } from '../../../ui/animations/standard-list.ani'; -import { expandFadeFastAnimation } from '../../../ui/animations/expand.ani'; -import { map } from 'rxjs/operators'; -import { filterDoneTasks } from '../filter-done-tasks.pipe'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + Input, + OnDestroy, + OnInit, + ViewChild +} from '@angular/core'; +import {Task, TaskWithSubTasks} from '../task.model'; +import {TaskService} from '../task.service'; +import {DragulaService} from 'ng2-dragula'; +import {BehaviorSubject, combineLatest, Observable, Subscription} from 'rxjs'; +import {standardListAnimation} from '../../../ui/animations/standard-list.ani'; +import {expandFadeFastAnimation} from '../../../ui/animations/expand.ani'; +import {map} from 'rxjs/operators'; +import {filterDoneTasks} from '../filter-done-tasks.pipe'; @Component({ selector: 'task-list', @@ -35,7 +43,7 @@ export class TaskListComponent implements OnDestroy, OnInit { @Input() listId: string; @Input() listModelId: string; @Input() noTasksMsg: string; - @ViewChild('listEl', { static: true }) listEl; + @ViewChild('listEl', {static: true}) listEl; isBlockAni = true; doneTasksLength = 0; undoneTasksLength = 0; diff --git a/src/app/features/tasks/task-summary-table/task-summary-table.component.spec.ts b/src/app/features/tasks/task-summary-table/task-summary-table.component.spec.ts index d666024ddf..47beb3e889 100644 --- a/src/app/features/tasks/task-summary-table/task-summary-table.component.spec.ts +++ b/src/app/features/tasks/task-summary-table/task-summary-table.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { TaskSummaryTableComponent } from './task-summary-table.component'; +import {TaskSummaryTableComponent} from './task-summary-table.component'; describe('TaskSummaryTableComponent', () => { let component: TaskSummaryTableComponent; @@ -8,9 +8,9 @@ describe('TaskSummaryTableComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ TaskSummaryTableComponent ] + declarations: [TaskSummaryTableComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/features/tasks/task.model.ts b/src/app/features/tasks/task.model.ts index f0fadfd0c7..ecd9f6e27b 100644 --- a/src/app/features/tasks/task.model.ts +++ b/src/app/features/tasks/task.model.ts @@ -1,5 +1,5 @@ -import { IssueData, IssueProviderKey } from '../issue/issue'; -import { Reminder, ReminderCopy } from '../reminder/reminder.model'; +import {IssueData, IssueProviderKey} from '../issue/issue'; +import {Reminder} from '../reminder/reminder.model'; import {EntityState} from '@ngrx/entity'; export type DropListModelSource = 'UNDONE' | 'DONE' | 'BACKLOG'; diff --git a/src/app/features/tasks/tasks.module.ts b/src/app/features/tasks/tasks.module.ts index 2762a757fc..dcf09d4a41 100644 --- a/src/app/features/tasks/tasks.module.ts +++ b/src/app/features/tasks/tasks.module.ts @@ -1,23 +1,23 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { TaskComponent } from './task/task.component'; -import { TaskListComponent } from './task-list/task-list.component'; -import { UiModule } from '../../ui/ui.module'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { AddTaskBarComponent } from './add-task-bar/add-task-bar.component'; -import { DialogTimeEstimateComponent } from './dialog-time-estimate/dialog-time-estimate.component'; -import { StoreModule } from '@ngrx/store'; -import { TaskEffects } from './store/task.effects'; -import { EffectsModule } from '@ngrx/effects'; -import { TASK_FEATURE_NAME, taskReducer } from './store/task.reducer'; -import { TaskAdditionalInfoComponent } from './task-additional-info/task-additional-info.component'; -import { SelectTaskComponent } from './select-task/select-task.component'; -import { AttachmentModule } from '../attachment/attachment.module'; -import { IssueModule } from '../issue/issue.module'; -import { FilterDoneTasksPipe } from './filter-done-tasks.pipe'; -import { DialogViewTaskReminderComponent } from './dialog-view-task-reminder/dialog-view-task-reminder.component'; -import { DialogAddTaskReminderComponent } from './dialog-add-task-reminder/dialog-add-task-reminder.component'; -import { TaskSummaryTableComponent } from './task-summary-table/task-summary-table.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {TaskComponent} from './task/task.component'; +import {TaskListComponent} from './task-list/task-list.component'; +import {UiModule} from '../../ui/ui.module'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {AddTaskBarComponent} from './add-task-bar/add-task-bar.component'; +import {DialogTimeEstimateComponent} from './dialog-time-estimate/dialog-time-estimate.component'; +import {StoreModule} from '@ngrx/store'; +import {TaskEffects} from './store/task.effects'; +import {EffectsModule} from '@ngrx/effects'; +import {TASK_FEATURE_NAME, taskReducer} from './store/task.reducer'; +import {TaskAdditionalInfoComponent} from './task-additional-info/task-additional-info.component'; +import {SelectTaskComponent} from './select-task/select-task.component'; +import {AttachmentModule} from '../attachment/attachment.module'; +import {IssueModule} from '../issue/issue.module'; +import {FilterDoneTasksPipe} from './filter-done-tasks.pipe'; +import {DialogViewTaskReminderComponent} from './dialog-view-task-reminder/dialog-view-task-reminder.component'; +import {DialogAddTaskReminderComponent} from './dialog-add-task-reminder/dialog-add-task-reminder.component'; +import {TaskSummaryTableComponent} from './task-summary-table/task-summary-table.component'; @NgModule({ imports: [ diff --git a/src/app/features/tasks/util/calc-total-time-spent.ts b/src/app/features/tasks/util/calc-total-time-spent.ts index eb2deec6a8..aae166fd97 100644 --- a/src/app/features/tasks/util/calc-total-time-spent.ts +++ b/src/app/features/tasks/util/calc-total-time-spent.ts @@ -1,4 +1,4 @@ -import { TimeSpentOnDay } from '../task.model'; +import {TimeSpentOnDay} from '../task.model'; export const calcTotalTimeSpent = (timeSpentOnDay: TimeSpentOnDay) => { let totalTimeSpent = 0; diff --git a/src/app/features/tasks/util/create-task-copy.ts b/src/app/features/tasks/util/create-task-copy.ts index af27bdb804..c3123654be 100644 --- a/src/app/features/tasks/util/create-task-copy.ts +++ b/src/app/features/tasks/util/create-task-copy.ts @@ -1,5 +1,5 @@ -import { dirtyDeepCopy } from '../../../util/dirtyDeepCopy'; -import { TaskCopy } from '../task.model'; +import {dirtyDeepCopy} from '../../../util/dirtyDeepCopy'; +import {TaskCopy} from '../task.model'; export const createTaskCopy = (task): TaskCopy => { return dirtyDeepCopy(task); diff --git a/src/app/features/tasks/util/get-today-str.ts b/src/app/features/tasks/util/get-today-str.ts index cdac8fe0b5..83055eff35 100644 --- a/src/app/features/tasks/util/get-today-str.ts +++ b/src/app/features/tasks/util/get-today-str.ts @@ -1,4 +1,4 @@ -import { WORKLOG_DATE_STR_FORMAT } from '../../../app.constants'; +import {WORKLOG_DATE_STR_FORMAT} from '../../../app.constants'; import * as moment from 'moment-mini'; // TODO maybe remove in favor of getWorklogStr export const getTodayStr = () => moment().format(WORKLOG_DATE_STR_FORMAT); diff --git a/src/app/features/time-tracking/dialog-idle/dialog-idle.component.html b/src/app/features/time-tracking/dialog-idle/dialog-idle.component.html index f65e828c90..3a07fcf034 100644 --- a/src/app/features/time-tracking/dialog-idle/dialog-idle.component.html +++ b/src/app/features/time-tracking/dialog-idle/dialog-idle.component.html @@ -52,9 +52,9 @@ type="button"> track_changes add - + Task+Break - free_breakfast + free_breakfast diff --git a/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts b/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts index 89e0e02053..c1ed0339f4 100644 --- a/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts +++ b/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectionStrategy, Component, Inject, OnInit} from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {TaskService} from '../../tasks/task.service'; import {Observable} from 'rxjs'; import {Task} from '../../tasks/task.model'; diff --git a/src/app/features/time-tracking/take-a-break/take-a-break.module.ts b/src/app/features/time-tracking/take-a-break/take-a-break.module.ts index d8e5b2140b..d32d73d5df 100644 --- a/src/app/features/time-tracking/take-a-break/take-a-break.module.ts +++ b/src/app/features/time-tracking/take-a-break/take-a-break.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; @NgModule({ declarations: [], diff --git a/src/app/features/time-tracking/time-tracking.module.ts b/src/app/features/time-tracking/time-tracking.module.ts index aa476b475e..fff7f3544b 100644 --- a/src/app/features/time-tracking/time-tracking.module.ts +++ b/src/app/features/time-tracking/time-tracking.module.ts @@ -1,12 +1,12 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { TimeTrackingService } from './time-tracking.service'; -import { DialogIdleComponent } from './dialog-idle/dialog-idle.component'; -import { IdleService } from './idle.service'; -import { UiModule } from '../../ui/ui.module'; -import { FormsModule } from '@angular/forms'; -import { TakeABreakModule } from './take-a-break/take-a-break.module'; -import { TasksModule } from '../tasks/tasks.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {TimeTrackingService} from './time-tracking.service'; +import {DialogIdleComponent} from './dialog-idle/dialog-idle.component'; +import {IdleService} from './idle.service'; +import {UiModule} from '../../ui/ui.module'; +import {FormsModule} from '@angular/forms'; +import {TakeABreakModule} from './take-a-break/take-a-break.module'; +import {TasksModule} from '../tasks/tasks.module'; @NgModule({ imports: [ diff --git a/src/app/features/time-tracking/time-tracking.service.spec.ts b/src/app/features/time-tracking/time-tracking.service.spec.ts index 5ba250bda8..1e730cbbe7 100644 --- a/src/app/features/time-tracking/time-tracking.service.spec.ts +++ b/src/app/features/time-tracking/time-tracking.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed } from '@angular/core/testing'; -import { TimeTrackingService } from './time-tracking.service'; -import { map } from 'rxjs/operators'; -import { cold } from 'jasmine-marbles'; +import {TestBed} from '@angular/core/testing'; +import {TimeTrackingService} from './time-tracking.service'; +import {map} from 'rxjs/operators'; +import {cold} from 'jasmine-marbles'; describe('TimeTrackingService', () => { let service: TimeTrackingService; diff --git a/src/app/features/time-tracking/time-tracking.service.ts b/src/app/features/time-tracking/time-tracking.service.ts index 88c6e9b84e..33937d4247 100644 --- a/src/app/features/time-tracking/time-tracking.service.ts +++ b/src/app/features/time-tracking/time-tracking.service.ts @@ -1,9 +1,9 @@ -import { Injectable } from '@angular/core'; -import { TRACKING_INTERVAL } from '../../app.constants'; -import { interval, Observable } from 'rxjs'; -import { map, share } from 'rxjs/operators'; -import { Tick } from './time-tracking'; -import { getWorklogStr } from '../../util/get-work-log-str'; +import {Injectable} from '@angular/core'; +import {TRACKING_INTERVAL} from '../../app.constants'; +import {interval, Observable} from 'rxjs'; +import {map, share} from 'rxjs/operators'; +import {Tick} from './time-tracking'; +import {getWorklogStr} from '../../util/get-work-log-str'; @Injectable({ providedIn: 'root', diff --git a/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts b/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts index 53f72c0c85..9142181890 100644 --- a/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts +++ b/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts @@ -1,7 +1,7 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { WorklogExportSettingsCopy } from '../../project/project.model'; -import { WORKLOG_EXPORT_DEFAULTS } from '../../project/project.const'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {WorklogExportSettingsCopy} from '../../project/project.model'; +import {WORKLOG_EXPORT_DEFAULTS} from '../../project/project.const'; @Component({ selector: 'dialog-worklog-export', diff --git a/src/app/features/worklog/map-archive-to-worklog.ts b/src/app/features/worklog/map-archive-to-worklog.ts index 1a698cdc7c..9fb872192f 100644 --- a/src/app/features/worklog/map-archive-to-worklog.ts +++ b/src/app/features/worklog/map-archive-to-worklog.ts @@ -1,9 +1,9 @@ -import { EntityState } from '@ngrx/entity'; -import { Task } from '../tasks/task.model'; -import { getWeeksInMonth, WeeksInMonth } from '../../util/get-weeks-in-month'; -import { getWeekNumber } from '../../util/get-week-number'; +import {EntityState} from '@ngrx/entity'; +import {Task} from '../tasks/task.model'; +import {getWeeksInMonth} from '../../util/get-weeks-in-month'; +import {getWeekNumber} from '../../util/get-week-number'; import * as moment from 'moment-mini'; -import { WorkStartEnd } from '../project/project.model'; +import {WorkStartEnd} from '../project/project.model'; import {Worklog, WorklogDay, WorklogMonth, WorklogWeek, WorklogYear} from './worklog.model'; diff --git a/src/app/features/worklog/worklog-export/worklog-export.component.ts b/src/app/features/worklog/worklog-export/worklog-export.component.ts index d7e738041a..2715672d76 100644 --- a/src/app/features/worklog/worklog-export/worklog-export.component.ts +++ b/src/app/features/worklog/worklog-export/worklog-export.component.ts @@ -1,21 +1,21 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { TaskCopy } from '../../tasks/task.model'; -import { ProjectService } from '../../project/project.service'; -import { Subscription } from 'rxjs'; -import { WorklogExportSettingsCopy, WorkStartEnd } from '../../project/project.model'; -import { WORKLOG_EXPORT_DEFAULTS } from '../../project/project.const'; -import { getWorklogStr } from '../../../util/get-work-log-str'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core'; +import {TaskCopy} from '../../tasks/task.model'; +import {ProjectService} from '../../project/project.service'; +import {Subscription} from 'rxjs'; +import {WorklogExportSettingsCopy, WorkStartEnd} from '../../project/project.model'; +import {WORKLOG_EXPORT_DEFAULTS} from '../../project/project.const'; +import {getWorklogStr} from '../../../util/get-work-log-str'; import * as moment from 'moment-mini'; import 'moment-duration-format'; -import { unique } from '../../../util/unique'; -import { msToString } from '../../../ui/duration/ms-to-string.pipe'; -import { msToClockString } from '../../../ui/duration/ms-to-clock-string.pipe'; -import { roundTime } from '../../../util/round-time'; -import { roundDuration } from '../../../util/round-duration'; +import {unique} from '../../../util/unique'; +import {msToString} from '../../../ui/duration/ms-to-string.pipe'; +import {msToClockString} from '../../../ui/duration/ms-to-clock-string.pipe'; +import {roundTime} from '../../../util/round-time'; +import {roundDuration} from '../../../util/round-duration'; import Clipboard from 'clipboard'; -import { SnackService } from '../../../core/snack/snack.service'; -import { WorklogService } from '../worklog.service'; -import { WorklogTask } from '../worklog.model'; +import {SnackService} from '../../../core/snack/snack.service'; +import {WorklogService} from '../worklog.service'; +import {WorklogTask} from '../worklog.model'; const LINE_SEPARATOR = '\n'; const EMPTY_VAL = ' - '; diff --git a/src/app/features/worklog/worklog-week/worklog-week.component.spec.ts b/src/app/features/worklog/worklog-week/worklog-week.component.spec.ts index 9a25033a30..486d549b51 100644 --- a/src/app/features/worklog/worklog-week/worklog-week.component.spec.ts +++ b/src/app/features/worklog/worklog-week/worklog-week.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { WorklogWeekComponent } from './worklog-week.component'; +import {WorklogWeekComponent} from './worklog-week.component'; describe('WorklogWeekComponent', () => { let component: WorklogWeekComponent; @@ -8,9 +8,9 @@ describe('WorklogWeekComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ WorklogWeekComponent ] + declarations: [WorklogWeekComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/features/worklog/worklog-week/worklog-week.component.ts b/src/app/features/worklog/worklog-week/worklog-week.component.ts index c4534de5ca..74828b3b10 100644 --- a/src/app/features/worklog/worklog-week/worklog-week.component.ts +++ b/src/app/features/worklog/worklog-week/worklog-week.component.ts @@ -1,12 +1,12 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { WorklogService } from '../worklog.service'; -import { DialogWorklogExportComponent } from '../dialog-worklog-export/dialog-worklog-export.component'; -import { MatDialog } from '@angular/material/dialog'; -import { WorklogDataForDay } from '../worklog.model'; -import { expandAnimation, expandFadeAnimation } from '../../../ui/animations/expand.ani'; -import { fadeAnimation } from '../../../ui/animations/fade.ani'; -import { getDateRangeForWeek } from '../../../util/get-date-range-for-week'; -import { getWeekNumber } from '../../../util/get-week-number'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; +import {WorklogService} from '../worklog.service'; +import {DialogWorklogExportComponent} from '../dialog-worklog-export/dialog-worklog-export.component'; +import {MatDialog} from '@angular/material/dialog'; +import {WorklogDataForDay} from '../worklog.model'; +import {expandAnimation, expandFadeAnimation} from '../../../ui/animations/expand.ani'; +import {fadeAnimation} from '../../../ui/animations/fade.ani'; +import {getDateRangeForWeek} from '../../../util/get-date-range-for-week'; +import {getWeekNumber} from '../../../util/get-week-number'; import {Task} from '../../tasks/task.model'; import {TaskService} from '../../tasks/task.service'; diff --git a/src/app/features/worklog/worklog.component.scss b/src/app/features/worklog/worklog.component.scss index 8579084828..e50d752e6e 100644 --- a/src/app/features/worklog/worklog.component.scss +++ b/src/app/features/worklog/worklog.component.scss @@ -220,7 +220,7 @@ $this-table-width: 300px; } } -.repeat-task-icon{ +.repeat-task-icon { vertical-align: middle; margin-right: 4px; transform: rotate(45deg); diff --git a/src/app/features/worklog/worklog.module.ts b/src/app/features/worklog/worklog.module.ts index 2fedeec7d9..95a4cd83ae 100644 --- a/src/app/features/worklog/worklog.module.ts +++ b/src/app/features/worklog/worklog.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { WorklogComponent } from './worklog.component'; -import { UiModule } from '../../ui/ui.module'; -import { DialogWorklogExportComponent } from './dialog-worklog-export/dialog-worklog-export.component'; -import { WorklogExportComponent } from './worklog-export/worklog-export.component'; -import { FormsModule } from '@angular/forms'; -import { WorklogWeekComponent } from './worklog-week/worklog-week.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {WorklogComponent} from './worklog.component'; +import {UiModule} from '../../ui/ui.module'; +import {DialogWorklogExportComponent} from './dialog-worklog-export/dialog-worklog-export.component'; +import {WorklogExportComponent} from './worklog-export/worklog-export.component'; +import {FormsModule} from '@angular/forms'; +import {WorklogWeekComponent} from './worklog-week/worklog-week.component'; @NgModule({ imports: [ diff --git a/src/app/features/worklog/worklog.service.spec.ts b/src/app/features/worklog/worklog.service.spec.ts index b80f1a7c40..ad8dd6d105 100644 --- a/src/app/features/worklog/worklog.service.spec.ts +++ b/src/app/features/worklog/worklog.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { WorklogService } from './worklog.service'; +import {WorklogService} from './worklog.service'; describe('WorklogService', () => { beforeEach(() => TestBed.configureTestingModule({})); diff --git a/src/app/imex/file-imex/file-imex.component.ts b/src/app/imex/file-imex/file-imex.component.ts index be1bc77e8d..83a6fc3956 100644 --- a/src/app/imex/file-imex/file-imex.component.ts +++ b/src/app/imex/file-imex/file-imex.component.ts @@ -13,7 +13,7 @@ import {download} from '../../util/download'; changeDetection: ChangeDetectionStrategy.OnPush }) export class FileImexComponent { - @ViewChild('fileInput', { static: true }) fileInputRef: ElementRef; + @ViewChild('fileInput', {static: true}) fileInputRef: ElementRef; constructor( private _syncService: SyncService, diff --git a/src/app/imex/file-imex/file-imex.module.ts b/src/app/imex/file-imex/file-imex.module.ts index 0c83e694b8..fa7a6eb173 100644 --- a/src/app/imex/file-imex/file-imex.module.ts +++ b/src/app/imex/file-imex/file-imex.module.ts @@ -1,8 +1,8 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FileImexComponent } from './file-imex.component'; -import { UiModule } from '../../ui/ui.module'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FileImexComponent} from './file-imex.component'; +import {UiModule} from '../../ui/ui.module'; +import {FormsModule} from '@angular/forms'; @NgModule({ imports: [ diff --git a/src/app/imex/imex-meta/imex-meta.module.ts b/src/app/imex/imex-meta/imex-meta.module.ts index b7399ed8b5..e4ff825314 100644 --- a/src/app/imex/imex-meta/imex-meta.module.ts +++ b/src/app/imex/imex-meta/imex-meta.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; @NgModule({ declarations: [], @@ -7,4 +7,5 @@ import { CommonModule } from '@angular/common'; CommonModule ] }) -export class ImexMetaModule { } +export class ImexMetaModule { +} diff --git a/src/app/imex/imex-meta/imex-meta.service.spec.ts b/src/app/imex/imex-meta/imex-meta.service.spec.ts index 224f06b4f5..b7c469dc93 100644 --- a/src/app/imex/imex-meta/imex-meta.service.spec.ts +++ b/src/app/imex/imex-meta/imex-meta.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { ImexMetaService } from './imex-meta.service'; +import {ImexMetaService} from './imex-meta.service'; describe('ImexMetaService', () => { beforeEach(() => TestBed.configureTestingModule({})); diff --git a/src/app/imex/imex-meta/imex-meta.service.ts b/src/app/imex/imex-meta/imex-meta.service.ts index 7553640cb7..49e285ff36 100644 --- a/src/app/imex/imex-meta/imex-meta.service.ts +++ b/src/app/imex/imex-meta/imex-meta.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@angular/core'; -import { BehaviorSubject, Observable } from 'rxjs'; +import {Injectable} from '@angular/core'; +import {BehaviorSubject, Observable} from 'rxjs'; @Injectable({ providedIn: 'root' diff --git a/src/app/imex/local-backup/local-backup.module.ts b/src/app/imex/local-backup/local-backup.module.ts index 6ea334519b..58df5c7e32 100644 --- a/src/app/imex/local-backup/local-backup.module.ts +++ b/src/app/imex/local-backup/local-backup.module.ts @@ -1,6 +1,6 @@ -import { NgModule } from '@angular/core'; -import { LocalBackupService } from './local-backup.service'; -import { IS_ELECTRON } from '../../app.constants'; +import {NgModule} from '@angular/core'; +import {LocalBackupService} from './local-backup.service'; +import {IS_ELECTRON} from '../../app.constants'; @NgModule({ providers: [LocalBackupService], diff --git a/src/app/imex/local-backup/local-backup.service.ts b/src/app/imex/local-backup/local-backup.service.ts index a36992400b..8da5fcd855 100644 --- a/src/app/imex/local-backup/local-backup.service.ts +++ b/src/app/imex/local-backup/local-backup.service.ts @@ -1,11 +1,11 @@ -import { Injectable } from '@angular/core'; -import { GlobalConfigService } from '../../features/config/global-config.service'; -import { interval, Observable } from 'rxjs'; -import { LocalBackupConfig } from '../../features/config/global-config.model'; -import { filter, map, switchMap, tap } from 'rxjs/operators'; -import { SyncService } from '../sync/sync.service'; -import { ElectronService } from 'ngx-electron'; -import { IPC_BACKUP } from '../../../../electron/ipc-events.const'; +import {Injectable} from '@angular/core'; +import {GlobalConfigService} from '../../features/config/global-config.service'; +import {interval, Observable} from 'rxjs'; +import {LocalBackupConfig} from '../../features/config/global-config.model'; +import {filter, map, switchMap, tap} from 'rxjs/operators'; +import {SyncService} from '../sync/sync.service'; +import {ElectronService} from 'ngx-electron'; +import {IPC_BACKUP} from '../../../../electron/ipc-events.const'; const DEFAULT_BACKUP_INTERVAL = 2 * 60 * 1000; diff --git a/src/app/imex/migrate/dialog-migrate/dialog-migrate.component.ts b/src/app/imex/migrate/dialog-migrate/dialog-migrate.component.ts index caf5d6dea8..4f96ad1191 100644 --- a/src/app/imex/migrate/dialog-migrate/dialog-migrate.component.ts +++ b/src/app/imex/migrate/dialog-migrate/dialog-migrate.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; @Component({ selector: 'dialog-migrate', diff --git a/src/app/imex/migrate/migrate.module.ts b/src/app/imex/migrate/migrate.module.ts index a2e70ef362..06a3d0f8d9 100644 --- a/src/app/imex/migrate/migrate.module.ts +++ b/src/app/imex/migrate/migrate.module.ts @@ -1,7 +1,7 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { DialogMigrateComponent } from './dialog-migrate/dialog-migrate.component'; -import { UiModule } from '../../ui/ui.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {DialogMigrateComponent} from './dialog-migrate/dialog-migrate.component'; +import {UiModule} from '../../ui/ui.module'; @NgModule({ declarations: [DialogMigrateComponent], diff --git a/src/app/imex/migrate/migrate.service.ts b/src/app/imex/migrate/migrate.service.ts index 2c3b459a9b..c8fa7e0a00 100644 --- a/src/app/imex/migrate/migrate.service.ts +++ b/src/app/imex/migrate/migrate.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@angular/core'; -import { loadFromLs, saveToLs } from '../../core/persistence/local-storage'; +import {Injectable} from '@angular/core'; +import {loadFromLs, saveToLs} from '../../core/persistence/local-storage'; import { STORAGE_BACKLOG_TASKS, STORAGE_CONFIG, @@ -10,30 +10,30 @@ import { STORAGE_TASKS, STORAGE_THEME } from './migrate.const'; -import { MatDialog } from '@angular/material/dialog'; -import { LS_IS_V1_MIGRATE } from '../../core/persistence/ls-keys.const'; -import { SnackService } from '../../core/snack/snack.service'; -import { PersistenceService } from '../../core/persistence/persistence.service'; -import { SyncService } from '../../imex/sync/sync.service'; -import { OldDataExport, OldGithubSettings, OldJiraSettings, OldProject, OldTask } from './migrate.model'; -import { ProjectService } from '../../features/project/project.service'; -import { JiraCfg } from '../../features/issue/jira/jira'; -import { DEFAULT_JIRA_CFG } from '../../features/issue/jira/jira.const'; -import { initialTaskState } from '../../features/tasks/store/task.reducer'; -import { EntityState } from '@ngrx/entity'; -import { DEFAULT_TASK, Task } from '../../features/tasks/task.model'; +import {MatDialog} from '@angular/material/dialog'; +import {LS_IS_V1_MIGRATE} from '../../core/persistence/ls-keys.const'; +import {SnackService} from '../../core/snack/snack.service'; +import {PersistenceService} from '../../core/persistence/persistence.service'; +import {SyncService} from '../../imex/sync/sync.service'; +import {OldDataExport, OldGithubSettings, OldJiraSettings, OldProject, OldTask} from './migrate.model'; +import {ProjectService} from '../../features/project/project.service'; +import {JiraCfg} from '../../features/issue/jira/jira'; +import {DEFAULT_JIRA_CFG} from '../../features/issue/jira/jira.const'; +import {initialTaskState} from '../../features/tasks/store/task.reducer'; +import {EntityState} from '@ngrx/entity'; +import {DEFAULT_TASK, Task} from '../../features/tasks/task.model'; import * as moment from 'moment-mini'; -import { JiraIssue } from '../../features/issue/jira/jira-issue/jira-issue.model'; -import { GithubIssue } from '../../features/issue/github/github-issue/github-issue.model'; -import { IssueProviderKey } from '../../features/issue/issue'; -import { GithubCfg } from '../../features/issue/github/github'; -import { DEFAULT_GITHUB_CFG } from '../../features/issue/github/github.const'; -import { GithubApiService } from '../../features/issue/github/github-api.service'; -import { first } from 'rxjs/operators'; -import { DialogMigrateComponent } from './dialog-migrate/dialog-migrate.component'; -import { JiraIssueState } from '../../features/issue/jira/jira-issue/store/jira-issue.reducer'; -import { GithubIssueState } from '../../features/issue/github/github-issue/store/github-issue.reducer'; -import { GITHUB_TYPE } from '../../features/issue/issue.const'; +import {JiraIssue} from '../../features/issue/jira/jira-issue/jira-issue.model'; +import {GithubIssue} from '../../features/issue/github/github-issue/github-issue.model'; +import {IssueProviderKey} from '../../features/issue/issue'; +import {GithubCfg} from '../../features/issue/github/github'; +import {DEFAULT_GITHUB_CFG} from '../../features/issue/github/github.const'; +import {GithubApiService} from '../../features/issue/github/github-api.service'; +import {first} from 'rxjs/operators'; +import {DialogMigrateComponent} from './dialog-migrate/dialog-migrate.component'; +import {JiraIssueState} from '../../features/issue/jira/jira-issue/store/jira-issue.reducer'; +import {GithubIssueState} from '../../features/issue/github/github-issue/store/github-issue.reducer'; +import {GITHUB_TYPE} from '../../features/issue/issue.const'; @Injectable({ providedIn: 'root', diff --git a/src/app/imex/sync/sync.model.ts b/src/app/imex/sync/sync.model.ts index 2cf14a196f..1fa3ca0d68 100644 --- a/src/app/imex/sync/sync.model.ts +++ b/src/app/imex/sync/sync.model.ts @@ -1,8 +1,7 @@ import {ProjectState} from '../../features/project/store/project.reducer'; import {TaskState} from '../../features/tasks/store/task.reducer'; import {GlobalConfigState} from '../../features/config/global-config.model'; -import {EntityState} from '@ngrx/entity'; -import {Task, TaskArchive} from '../../features/tasks/task.model'; +import {TaskArchive} from '../../features/tasks/task.model'; import {IssueStateMap} from '../../features/issue/issue'; import {BookmarkState} from '../../features/bookmark/store/bookmark.reducer'; import {NoteState} from '../../features/note/store/note.reducer'; diff --git a/src/app/imex/sync/sync.module.ts b/src/app/imex/sync/sync.module.ts index c9a23ee7b8..0cd201c249 100644 --- a/src/app/imex/sync/sync.module.ts +++ b/src/app/imex/sync/sync.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import {NgModule} from '@angular/core'; @NgModule({}) export class SyncModule { diff --git a/src/app/imex/sync/sync.service.spec.ts b/src/app/imex/sync/sync.service.spec.ts index 7ae70d53a3..32d51028fd 100644 --- a/src/app/imex/sync/sync.service.spec.ts +++ b/src/app/imex/sync/sync.service.spec.ts @@ -1,16 +1,16 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { SyncService } from './sync.service'; -import { PersistenceService } from '../../core/persistence/persistence.service'; -import { SnackService } from '../../core/snack/snack.service'; -import { ProjectService } from '../../features/project/project.service'; -import { GlobalConfigService } from '../../features/config/global-config.service'; -import { TaskService } from '../../features/tasks/task.service'; -import { AttachmentService } from '../../features/attachment/attachment.service'; -import { BookmarkService } from '../../features/bookmark/bookmark.service'; -import { JiraIssueService } from '../../features/issue/jira/jira-issue/jira-issue.service'; -import { NoteService } from '../../features/note/note.service'; -import { ReminderService } from '../../features/reminder/reminder.service'; +import {SyncService} from './sync.service'; +import {PersistenceService} from '../../core/persistence/persistence.service'; +import {SnackService} from '../../core/snack/snack.service'; +import {ProjectService} from '../../features/project/project.service'; +import {GlobalConfigService} from '../../features/config/global-config.service'; +import {TaskService} from '../../features/tasks/task.service'; +import {AttachmentService} from '../../features/attachment/attachment.service'; +import {BookmarkService} from '../../features/bookmark/bookmark.service'; +import {JiraIssueService} from '../../features/issue/jira/jira-issue/jira-issue.service'; +import {NoteService} from '../../features/note/note.service'; +import {ReminderService} from '../../features/reminder/reminder.service'; describe('SyncService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/src/app/pages/config-page/config-page.component.ts b/src/app/pages/config-page/config-page.component.ts index 2561828eca..39fb1b05e2 100644 --- a/src/app/pages/config-page/config-page.component.ts +++ b/src/app/pages/config-page/config-page.component.ts @@ -2,7 +2,12 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit import {GlobalConfigService} from '../../features/config/global-config.service'; import {GLOBAL_CONFIG_FORM_CONFIG} from '../../features/config/global-config-form-config.const'; import {ProjectService} from '../../features/project/project.service'; -import {ConfigFormConfig, ConfigFormSection, GlobalConfigSectionKey, GlobalConfigState} from '../../features/config/global-config.model'; +import { + ConfigFormConfig, + ConfigFormSection, + GlobalConfigSectionKey, + GlobalConfigState +} from '../../features/config/global-config.model'; import {Subscription} from 'rxjs'; import {Project, ProjectAdvancedCfg, ProjectCfgFormKey} from '../../features/project/project.model'; import { diff --git a/src/app/pages/config-page/config-page.module.ts b/src/app/pages/config-page/config-page.module.ts index 73d50bacb0..e57785cf0f 100644 --- a/src/app/pages/config-page/config-page.module.ts +++ b/src/app/pages/config-page/config-page.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ConfigPageComponent } from './config-page.component'; -import { ConfigModule } from '../../features/config/config.module'; -import { UiModule } from '../../ui/ui.module'; -import { GoogleModule } from '../../features/google/google.module'; -import { JiraModule } from '../../features/issue/jira/jira.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {ConfigPageComponent} from './config-page.component'; +import {ConfigModule} from '../../features/config/config.module'; +import {UiModule} from '../../ui/ui.module'; +import {GoogleModule} from '../../features/google/google.module'; +import {JiraModule} from '../../features/issue/jira/jira.module'; @NgModule({ imports: [ diff --git a/src/app/pages/daily-summary/daily-summary.module.ts b/src/app/pages/daily-summary/daily-summary.module.ts index f695393680..6ed5bf89de 100644 --- a/src/app/pages/daily-summary/daily-summary.module.ts +++ b/src/app/pages/daily-summary/daily-summary.module.ts @@ -7,7 +7,7 @@ import {GoogleModule} from '../../features/google/google.module'; import {SimpleTaskExportModule} from '../../features/simple-task-export/simple-task-export.module'; import {RouterModule} from '@angular/router'; import {WorklogModule} from '../../features/worklog/worklog.module'; -import { MetricModule } from '../../features/metric/metric.module'; +import {MetricModule} from '../../features/metric/metric.module'; import {TasksModule} from '../../features/tasks/tasks.module'; @NgModule({ @@ -25,8 +25,7 @@ import {TasksModule} from '../../features/tasks/tasks.module'; declarations: [ DailySummaryComponent, ], - entryComponents: [ - ] + entryComponents: [] }) export class DailySummaryModule { diff --git a/src/app/pages/metric-page/metric-page.component.spec.ts b/src/app/pages/metric-page/metric-page.component.spec.ts index 664c8fe9c3..d414207044 100644 --- a/src/app/pages/metric-page/metric-page.component.spec.ts +++ b/src/app/pages/metric-page/metric-page.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { MetricPageComponent } from './metric-page.component'; +import {MetricPageComponent} from './metric-page.component'; describe('MetricPageComponent', () => { let component: MetricPageComponent; @@ -8,9 +8,9 @@ describe('MetricPageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ MetricPageComponent ] + declarations: [MetricPageComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/pages/metric-page/metric-page.module.ts b/src/app/pages/metric-page/metric-page.module.ts index 490f89e98f..2f8eabd499 100644 --- a/src/app/pages/metric-page/metric-page.module.ts +++ b/src/app/pages/metric-page/metric-page.module.ts @@ -1,6 +1,6 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MetricPageComponent } from './metric-page.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {MetricPageComponent} from './metric-page.component'; import {UiModule} from '../../ui/ui.module'; import {MetricModule} from '../../features/metric/metric.module'; @@ -12,4 +12,5 @@ import {MetricModule} from '../../features/metric/metric.module'; MetricModule, ] }) -export class MetricPageModule { } +export class MetricPageModule { +} diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 3357f4c210..086eacb035 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ConfigPageModule } from './config-page/config-page.module'; -import { ProjectPageModule } from './project-page/project-page.module'; -import { WorkViewPageModule } from './work-view/work-view-page.module'; -import { DailySummaryModule } from './daily-summary/daily-summary.module'; -import { WorklogAndCalendarModule } from './worklog-and-calendar/worklog-and-calendar.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {ConfigPageModule} from './config-page/config-page.module'; +import {ProjectPageModule} from './project-page/project-page.module'; +import {WorkViewPageModule} from './work-view/work-view-page.module'; +import {DailySummaryModule} from './daily-summary/daily-summary.module'; +import {WorklogAndCalendarModule} from './worklog-and-calendar/worklog-and-calendar.module'; import {MetricPageModule} from './metric-page/metric-page.module'; @NgModule({ diff --git a/src/app/pages/project-page/project-page.component.ts b/src/app/pages/project-page/project-page.component.ts index 5223e3354a..15c7dea5b0 100644 --- a/src/app/pages/project-page/project-page.component.ts +++ b/src/app/pages/project-page/project-page.component.ts @@ -1,6 +1,6 @@ import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from '@angular/core'; import {ProjectService} from '../../features/project/project.service'; -import { MatDialog } from '@angular/material/dialog'; +import {MatDialog} from '@angular/material/dialog'; import {DialogCreateProjectComponent} from '../../features/project/dialogs/create-project/dialog-create-project.component'; import {DialogConfirmComponent} from '../../ui/dialog-confirm/dialog-confirm.component'; import {standardListAnimation} from '../../ui/animations/standard-list.ani'; diff --git a/src/app/pages/project-page/project-page.module.ts b/src/app/pages/project-page/project-page.module.ts index 5cade11eac..ae0aa058cc 100644 --- a/src/app/pages/project-page/project-page.module.ts +++ b/src/app/pages/project-page/project-page.module.ts @@ -1,8 +1,8 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ProjectPageComponent } from './project-page.component'; -import { ProjectModule } from '../../features/project/project.module'; -import { UiModule } from '../../ui/ui.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {ProjectPageComponent} from './project-page.component'; +import {ProjectModule} from '../../features/project/project.module'; +import {UiModule} from '../../ui/ui.module'; @NgModule({ imports: [ diff --git a/src/app/pages/work-view/backlog-tabs/backlog-tabs.component.html b/src/app/pages/work-view/backlog-tabs/backlog-tabs.component.html index f6a88f5632..f0240a8760 100644 --- a/src/app/pages/work-view/backlog-tabs/backlog-tabs.component.html +++ b/src/app/pages/work-view/backlog-tabs/backlog-tabs.component.html @@ -71,7 +71,8 @@
-

From other Projects

+

From other Projects

{ let splitModule: SplitModule; diff --git a/src/app/pages/work-view/split/split.module.ts b/src/app/pages/work-view/split/split.module.ts index 06d3bd791b..24d8f987e2 100644 --- a/src/app/pages/work-view/split/split.module.ts +++ b/src/app/pages/work-view/split/split.module.ts @@ -1,8 +1,8 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SplitComponent } from './split.component'; -import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {SplitComponent} from './split.component'; +import {MatButtonModule} from '@angular/material/button'; +import {MatIconModule} from '@angular/material/icon'; @NgModule({ imports: [ diff --git a/src/app/pages/work-view/work-view-page.component.scss b/src/app/pages/work-view/work-view-page.component.scss index 25057357ec..d740877893 100644 --- a/src/app/pages/work-view/work-view-page.component.scss +++ b/src/app/pages/work-view/work-view-page.component.scss @@ -138,6 +138,7 @@ h2 { text-align: center; margin: $s*2 0 $s; white-space: nowrap; + button { margin: 0 $s; } diff --git a/src/app/pages/work-view/work-view-page.module.ts b/src/app/pages/work-view/work-view-page.module.ts index 068644cbf6..ee74795cc0 100644 --- a/src/app/pages/work-view/work-view-page.module.ts +++ b/src/app/pages/work-view/work-view-page.module.ts @@ -1,13 +1,13 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { WorkViewPageComponent } from './work-view-page.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { UiModule } from '../../ui/ui.module'; -import { TasksModule } from '../../features/tasks/tasks.module'; -import { RouterModule } from '@angular/router'; -import { SplitModule } from './split/split.module'; -import { TimeTrackingModule } from '../../features/time-tracking/time-tracking.module'; -import { BacklogTabsComponent } from './backlog-tabs/backlog-tabs.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {WorkViewPageComponent} from './work-view-page.component'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {UiModule} from '../../ui/ui.module'; +import {TasksModule} from '../../features/tasks/tasks.module'; +import {RouterModule} from '@angular/router'; +import {SplitModule} from './split/split.module'; +import {TimeTrackingModule} from '../../features/time-tracking/time-tracking.module'; +import {BacklogTabsComponent} from './backlog-tabs/backlog-tabs.component'; import {MetricModule} from '../../features/metric/metric.module'; @NgModule({ diff --git a/src/app/pages/worklog-and-calendar/calendar/calendar.component.ts b/src/app/pages/worklog-and-calendar/calendar/calendar.component.ts index 5b4895d564..457c7ceb55 100644 --- a/src/app/pages/worklog-and-calendar/calendar/calendar.component.ts +++ b/src/app/pages/worklog-and-calendar/calendar/calendar.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; @Component({ selector: 'calendar', diff --git a/src/app/pages/worklog-and-calendar/calendar/calendar.module.ts b/src/app/pages/worklog-and-calendar/calendar/calendar.module.ts index 490bed2d8b..3c0b89a996 100644 --- a/src/app/pages/worklog-and-calendar/calendar/calendar.module.ts +++ b/src/app/pages/worklog-and-calendar/calendar/calendar.module.ts @@ -1,6 +1,6 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CalendarComponent } from './calendar.component'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {CalendarComponent} from './calendar.component'; @NgModule({ imports: [ diff --git a/src/app/pages/worklog-and-calendar/worklog-and-calendar.component.ts b/src/app/pages/worklog-and-calendar/worklog-and-calendar.component.ts index 8999ac0f13..463ec001b4 100644 --- a/src/app/pages/worklog-and-calendar/worklog-and-calendar.component.ts +++ b/src/app/pages/worklog-and-calendar/worklog-and-calendar.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; @Component({ selector: 'worklog-and-calendar', diff --git a/src/app/pages/worklog-and-calendar/worklog-and-calendar.module.ts b/src/app/pages/worklog-and-calendar/worklog-and-calendar.module.ts index 7582cbbc34..6e69497d62 100644 --- a/src/app/pages/worklog-and-calendar/worklog-and-calendar.module.ts +++ b/src/app/pages/worklog-and-calendar/worklog-and-calendar.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { WorklogAndCalendarComponent } from './worklog-and-calendar.component'; -import { CalendarModule } from './calendar/calendar.module'; -import { WorklogModule } from '../../features/worklog/worklog.module'; -import { UiModule } from '../../ui/ui.module'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {WorklogAndCalendarComponent} from './worklog-and-calendar.component'; +import {CalendarModule} from './calendar/calendar.module'; +import {WorklogModule} from '../../features/worklog/worklog.module'; +import {UiModule} from '../../ui/ui.module'; +import {RouterModule} from '@angular/router'; @NgModule({ imports: [ diff --git a/src/app/root-store/index.ts b/src/app/root-store/index.ts index 6801b9f431..3a463351d2 100644 --- a/src/app/root-store/index.ts +++ b/src/app/root-store/index.ts @@ -1,4 +1,4 @@ -import { ActionReducerMap } from '@ngrx/store'; +import {ActionReducerMap} from '@ngrx/store'; export const reducers: ActionReducerMap = {}; diff --git a/src/app/root-store/root-store.module.ts b/src/app/root-store/root-store.module.ts index b268b8b111..97bfc2427d 100644 --- a/src/app/root-store/root-store.module.ts +++ b/src/app/root-store/root-store.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import {NgModule} from '@angular/core'; @NgModule({ imports: [], diff --git a/src/app/ui/animations/blend-in-out.ani.ts b/src/app/ui/animations/blend-in-out.ani.ts index a711616378..4deaba93d7 100644 --- a/src/app/ui/animations/blend-in-out.ani.ts +++ b/src/app/ui/animations/blend-in-out.ani.ts @@ -1,5 +1,5 @@ -import { animate, style, transition, trigger } from '@angular/animations'; -import { ANI_STANDARD_TIMING } from './animation.const'; +import {animate, style, transition, trigger} from '@angular/animations'; +import {ANI_STANDARD_TIMING} from './animation.const'; export const blendInOutAnimation = [ trigger('blendInOut', [ diff --git a/src/app/ui/animations/dynamic-height.ani.ts b/src/app/ui/animations/dynamic-height.ani.ts index e9dc0751a4..fce94bd883 100644 --- a/src/app/ui/animations/dynamic-height.ani.ts +++ b/src/app/ui/animations/dynamic-height.ani.ts @@ -1,13 +1,13 @@ -import { animate, style, transition, trigger } from '@angular/animations'; -import { ANI_STANDARD_TIMING } from './animation.const'; +import {animate, style, transition, trigger} from '@angular/animations'; +import {ANI_STANDARD_TIMING} from './animation.const'; export const dynamicHeightAnimation = [ trigger('dynamicHeight', [ - transition('void <=> *', []), - transition('* <=> *', [ - style({height: '{{startHeight}}px', opacity: 0}), - animate(ANI_STANDARD_TIMING), - ], {params: {startHeight: 0}}) + transition('void <=> *', []), + transition('* <=> *', [ + style({height: '{{startHeight}}px', opacity: 0}), + animate(ANI_STANDARD_TIMING), + ], {params: {startHeight: 0}}) ]) ]; diff --git a/src/app/ui/animations/expand.ani.ts b/src/app/ui/animations/expand.ani.ts index 5e19e91784..66b3b9e39d 100644 --- a/src/app/ui/animations/expand.ani.ts +++ b/src/app/ui/animations/expand.ani.ts @@ -1,5 +1,5 @@ -import { animate, style, transition, trigger } from '@angular/animations'; -import { ANI_ENTER_TIMING, ANI_FAST_TIMING, ANI_LEAVE_TIMING } from './animation.const'; +import {animate, style, transition, trigger} from '@angular/animations'; +import {ANI_ENTER_TIMING, ANI_FAST_TIMING, ANI_LEAVE_TIMING} from './animation.const'; export const expandAnimation = [ trigger('expand', [ diff --git a/src/app/ui/animations/fade.ani.ts b/src/app/ui/animations/fade.ani.ts index ae611655cd..0a1c9cf467 100644 --- a/src/app/ui/animations/fade.ani.ts +++ b/src/app/ui/animations/fade.ani.ts @@ -1,5 +1,5 @@ -import { animate, style, transition, trigger } from '@angular/animations'; -import { ANI_ENTER_TIMING, ANI_LEAVE_TIMING } from './animation.const'; +import {animate, style, transition, trigger} from '@angular/animations'; +import {ANI_ENTER_TIMING, ANI_LEAVE_TIMING} from './animation.const'; export const fadeAnimation = [ trigger('fade', [ diff --git a/src/app/ui/animations/noop.ani.ts b/src/app/ui/animations/noop.ani.ts index 6f1a1757e3..1129e0527e 100644 --- a/src/app/ui/animations/noop.ani.ts +++ b/src/app/ui/animations/noop.ani.ts @@ -1,4 +1,4 @@ -import { transition, trigger } from '@angular/animations'; +import {transition, trigger} from '@angular/animations'; export const noopAnimation = trigger( 'noop', diff --git a/src/app/ui/animations/slide.ani.ts b/src/app/ui/animations/slide.ani.ts index a8f200c654..9af1c245a5 100644 --- a/src/app/ui/animations/slide.ani.ts +++ b/src/app/ui/animations/slide.ani.ts @@ -1,5 +1,5 @@ -import { animate, style, transition, trigger } from '@angular/animations'; -import { ANI_ENTER_TIMING, ANI_LEAVE_TIMING } from './animation.const'; +import {animate, style, transition, trigger} from '@angular/animations'; +import {ANI_ENTER_TIMING, ANI_LEAVE_TIMING} from './animation.const'; export const slideAnimation = [ trigger('slide', [ diff --git a/src/app/ui/animations/standard-list.ani.ts b/src/app/ui/animations/standard-list.ani.ts index 03fb8c1d18..fb5a60c46b 100644 --- a/src/app/ui/animations/standard-list.ani.ts +++ b/src/app/ui/animations/standard-list.ani.ts @@ -1,5 +1,5 @@ -import { animate, keyframes, query, stagger, style, transition, trigger } from '@angular/animations'; -import { ANI_FAST_TIMING } from './animation.const'; +import {animate, keyframes, query, stagger, style, transition, trigger} from '@angular/animations'; +import {ANI_FAST_TIMING} from './animation.const'; const ANI = [ query(':enter', style({opacity: 0, height: 0}), {optional: true}), diff --git a/src/app/ui/animations/swirl-in-out.ani.ts b/src/app/ui/animations/swirl-in-out.ani.ts index 11ba783070..493d9b979b 100644 --- a/src/app/ui/animations/swirl-in-out.ani.ts +++ b/src/app/ui/animations/swirl-in-out.ani.ts @@ -1,5 +1,5 @@ -import { animate, keyframes, style, transition, trigger } from '@angular/animations'; -import { TRANSITION_DURATION_M } from './animation.const'; +import {animate, keyframes, style, transition, trigger} from '@angular/animations'; +import {TRANSITION_DURATION_M} from './animation.const'; const TIMING = `${TRANSITION_DURATION_M} linear`; diff --git a/src/app/ui/animations/warp-route.ts b/src/app/ui/animations/warp-route.ts index 0b1c8392d3..5be4249662 100644 --- a/src/app/ui/animations/warp-route.ts +++ b/src/app/ui/animations/warp-route.ts @@ -1,5 +1,5 @@ -import { animate, animateChild, group, query, style, transition, trigger } from '@angular/animations'; -import { ANI_ENTER_TIMING } from './animation.const'; +import {animate, animateChild, group, query, style, transition, trigger} from '@angular/animations'; +import {ANI_ENTER_TIMING} from './animation.const'; export const warpRouteAnimation = trigger('warpRoute', [ diff --git a/src/app/ui/chip-list-input/chip-list-input.component.spec.ts b/src/app/ui/chip-list-input/chip-list-input.component.spec.ts index 84524f86b6..d4c23c84bc 100644 --- a/src/app/ui/chip-list-input/chip-list-input.component.spec.ts +++ b/src/app/ui/chip-list-input/chip-list-input.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { ChipListInputComponent } from './chip-list-input.component'; +import {ChipListInputComponent} from './chip-list-input.component'; describe('ChipListInputComponent', () => { let component: ChipListInputComponent; @@ -8,9 +8,9 @@ describe('ChipListInputComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ChipListInputComponent ] + declarations: [ChipListInputComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/ui/chip-list-input/chip-list-input.component.ts b/src/app/ui/chip-list-input/chip-list-input.component.ts index 7c3f91006c..55b303b672 100644 --- a/src/app/ui/chip-list-input/chip-list-input.component.ts +++ b/src/app/ui/chip-list-input/chip-list-input.component.ts @@ -1,8 +1,8 @@ import {ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, Output, ViewChild} from '@angular/core'; import {FormControl} from '@angular/forms'; import {Observable} from 'rxjs'; -import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; -import { MatChipInputEvent } from '@angular/material/chips'; +import {MatAutocomplete, MatAutocompleteSelectedEvent} from '@angular/material/autocomplete'; +import {MatChipInputEvent} from '@angular/material/chips'; import {map, startWith} from 'rxjs/operators'; import {COMMA, ENTER} from '@angular/cdk/keycodes'; @@ -52,8 +52,8 @@ export class ChipListInputComponent { : this.suggestions_.filter(suggestion => !this._modelIds || !this._modelIds.includes(suggestion.id))) ); - @ViewChild('inputElRef', { static: true }) fruitInput: ElementRef; - @ViewChild('autoElRef', { static: true }) matAutocomplete: MatAutocomplete; + @ViewChild('inputElRef', {static: true}) fruitInput: ElementRef; + @ViewChild('autoElRef', {static: true}) matAutocomplete: MatAutocomplete; private _modelIds: string[] = []; diff --git a/src/app/ui/collapsible/collapsible.component.ts b/src/app/ui/collapsible/collapsible.component.ts index 724fc32f95..dadcaec4a7 100644 --- a/src/app/ui/collapsible/collapsible.component.ts +++ b/src/app/ui/collapsible/collapsible.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, HostBinding, Input, Output } from '@angular/core'; -import { expandAnimation } from '../animations/expand.ani'; +import {ChangeDetectionStrategy, Component, EventEmitter, HostBinding, Input, Output} from '@angular/core'; +import {expandAnimation} from '../animations/expand.ani'; @Component({ selector: 'collapsible', diff --git a/src/app/ui/dialog-confirm/dialog-confirm.component.ts b/src/app/ui/dialog-confirm/dialog-confirm.component.ts index ad5ee5b8b4..74dc503fce 100644 --- a/src/app/ui/dialog-confirm/dialog-confirm.component.ts +++ b/src/app/ui/dialog-confirm/dialog-confirm.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; @Component({ selector: 'dialog-confirm', diff --git a/src/app/ui/duration/duration-from-string.pipe.ts b/src/app/ui/duration/duration-from-string.pipe.ts index 478f0d8e5a..cd9a6a22ad 100644 --- a/src/app/ui/duration/duration-from-string.pipe.ts +++ b/src/app/ui/duration/duration-from-string.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import * as moment from 'moment-mini'; diff --git a/src/app/ui/duration/duration-to-string.pipe.ts b/src/app/ui/duration/duration-to-string.pipe.ts index a7c7f9416a..50d5993412 100644 --- a/src/app/ui/duration/duration-to-string.pipe.ts +++ b/src/app/ui/duration/duration-to-string.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; @Pipe({ name: 'durationToString' diff --git a/src/app/ui/duration/input-duration-formly/input-duration-formly.component.ts b/src/app/ui/duration/input-duration-formly/input-duration-formly.component.ts index 7bc5903507..afebdad6d3 100644 --- a/src/app/ui/duration/input-duration-formly/input-duration-formly.component.ts +++ b/src/app/ui/duration/input-duration-formly/input-duration-formly.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component, ViewChild } from '@angular/core'; -import { FieldType } from '@ngx-formly/material'; -import { MatInput } from '@angular/material/input'; +import {ChangeDetectionStrategy, Component, ViewChild} from '@angular/core'; +import {FieldType} from '@ngx-formly/material'; +import {MatInput} from '@angular/material/input'; @Component({ selector: 'input-duration-formly', @@ -9,5 +9,5 @@ import { MatInput } from '@angular/material/input'; changeDetection: ChangeDetectionStrategy.OnPush }) export class InputDurationFormlyComponent extends FieldType { - @ViewChild(MatInput, { static: true }) formFieldControl: MatInput; + @ViewChild(MatInput, {static: true}) formFieldControl: MatInput; } diff --git a/src/app/ui/duration/input-duration-slider/dot.ani.ts b/src/app/ui/duration/input-duration-slider/dot.ani.ts index d63911208a..7ef8a401d7 100644 --- a/src/app/ui/duration/input-duration-slider/dot.ani.ts +++ b/src/app/ui/duration/input-duration-slider/dot.ani.ts @@ -1,5 +1,5 @@ -import { animate, style, transition, trigger } from '@angular/animations'; -import { ANI_ENTER_TIMING, ANI_LEAVE_TIMING } from '../../animations/animation.const'; +import {animate, style, transition, trigger} from '@angular/animations'; +import {ANI_ENTER_TIMING, ANI_LEAVE_TIMING} from '../../animations/animation.const'; export const dotAnimation = [ trigger('dot', [ diff --git a/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts b/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts index b92f447be1..31ca1fff84 100644 --- a/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts +++ b/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts @@ -12,7 +12,7 @@ import { } from '@angular/core'; import shortid from 'shortid'; import * as moment from 'moment-mini'; -import { dotAnimation } from './dot.ani'; +import {dotAnimation} from './dot.ani'; @Component({ selector: 'input-duration-slider', @@ -31,7 +31,7 @@ export class InputDurationSliderComponent implements OnInit, OnDestroy { endHandler: () => void; moveHandler: (ev: any) => void; - @ViewChild('circleEl', { static: true }) circleEl: ElementRef; + @ViewChild('circleEl', {static: true}) circleEl: ElementRef; @Input() label: string; @Output() modelChange: EventEmitter = new EventEmitter(); diff --git a/src/app/ui/duration/input-duration.directive.ts b/src/app/ui/duration/input-duration.directive.ts index 3a8588de39..ef9a5e139f 100644 --- a/src/app/ui/duration/input-duration.directive.ts +++ b/src/app/ui/duration/input-duration.directive.ts @@ -1,4 +1,13 @@ -import { AfterViewChecked, Attribute, Directive, ElementRef, forwardRef, HostListener, Input, Renderer2 } from '@angular/core'; +import { + AfterViewChecked, + Attribute, + Directive, + ElementRef, + forwardRef, + HostListener, + Input, + Renderer2 +} from '@angular/core'; import { AbstractControl, ControlValueAccessor, @@ -9,8 +18,8 @@ import { ValidatorFn, Validators, } from '@angular/forms'; -import { StringToMsPipe } from './string-to-ms.pipe'; -import { MsToStringPipe } from './ms-to-string.pipe'; +import {StringToMsPipe} from './string-to-ms.pipe'; +import {MsToStringPipe} from './ms-to-string.pipe'; const noop = () => { }; @@ -26,6 +35,7 @@ export const INPUT_DURATION_VALIDATORS: any = { useExisting: forwardRef(() => InputDurationDirective), multi: true }; + /* tslint:enable */ @Directive({ diff --git a/src/app/ui/duration/ms-to-clock-string.pipe.ts b/src/app/ui/duration/ms-to-clock-string.pipe.ts index aa4c2234f3..1abf6ac2b8 100644 --- a/src/app/ui/duration/ms-to-clock-string.pipe.ts +++ b/src/app/ui/duration/ms-to-clock-string.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import * as moment from 'moment-mini'; export const msToClockString = (value: any, showSeconds?: boolean, isHideEmptyPlaceholder?: boolean): string => { diff --git a/src/app/ui/duration/ms-to-minute-clock-string.pipe.ts b/src/app/ui/duration/ms-to-minute-clock-string.pipe.ts index 27b916a1cf..e370550220 100644 --- a/src/app/ui/duration/ms-to-minute-clock-string.pipe.ts +++ b/src/app/ui/duration/ms-to-minute-clock-string.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import * as moment from 'moment-mini'; export const msToMinuteClockString = (value: any): string => { diff --git a/src/app/ui/duration/ms-to-string$.pipe.ts b/src/app/ui/duration/ms-to-string$.pipe.ts index 2140253997..c81f32c2d3 100644 --- a/src/app/ui/duration/ms-to-string$.pipe.ts +++ b/src/app/ui/duration/ms-to-string$.pipe.ts @@ -1,7 +1,7 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { msToString } from './ms-to-string.pipe'; +import {Pipe, PipeTransform} from '@angular/core'; +import {Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; +import {msToString} from './ms-to-string.pipe'; @Pipe({ name: 'msToString$' diff --git a/src/app/ui/duration/ms-to-string.pipe.ts b/src/app/ui/duration/ms-to-string.pipe.ts index 6c5cc579c6..2608db1ca7 100644 --- a/src/app/ui/duration/ms-to-string.pipe.ts +++ b/src/app/ui/duration/ms-to-string.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import * as moment from 'moment-mini'; export const msToString = (value: any, showSeconds?: boolean, isHideEmptyPlaceholder?: boolean): string => { diff --git a/src/app/ui/duration/string-to-ms.pipe.ts b/src/app/ui/duration/string-to-ms.pipe.ts index da04e4c604..f42210adf6 100644 --- a/src/app/ui/duration/string-to-ms.pipe.ts +++ b/src/app/ui/duration/string-to-ms.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; export const stringToMs = (strValue: any, args?: any): any => { if (!strValue) { diff --git a/src/app/ui/edit-on-click/edit-on-click.directive.ts b/src/app/ui/edit-on-click/edit-on-click.directive.ts index 3f22f2b343..bc87685f81 100644 --- a/src/app/ui/edit-on-click/edit-on-click.directive.ts +++ b/src/app/ui/edit-on-click/edit-on-click.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import {Directive, ElementRef, EventEmitter, Input, OnInit, Output} from '@angular/core'; // HELPER diff --git a/src/app/ui/enlarge-img/enlarge-img.directive.ts b/src/app/ui/enlarge-img/enlarge-img.directive.ts index 19f304bddb..bf4a9c1a88 100644 --- a/src/app/ui/enlarge-img/enlarge-img.directive.ts +++ b/src/app/ui/enlarge-img/enlarge-img.directive.ts @@ -1,5 +1,5 @@ -import { Directive, ElementRef, HostListener, Input, Renderer2 } from '@angular/core'; -import { getCoords } from './get-coords'; +import {Directive, ElementRef, HostListener, Input, Renderer2} from '@angular/core'; +import {getCoords} from './get-coords'; const LARGE_IMG_ID = 'enlarged-img'; diff --git a/src/app/ui/full-page-spinner/full-page-spinner.component.spec.ts b/src/app/ui/full-page-spinner/full-page-spinner.component.spec.ts index 252ab60c6e..1aeb18bc56 100644 --- a/src/app/ui/full-page-spinner/full-page-spinner.component.spec.ts +++ b/src/app/ui/full-page-spinner/full-page-spinner.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { FullPageSpinnerComponent } from './full-page-spinner.component'; +import {FullPageSpinnerComponent} from './full-page-spinner.component'; describe('FullPageSpinnerComponent', () => { let component: FullPageSpinnerComponent; @@ -8,9 +8,9 @@ describe('FullPageSpinnerComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ FullPageSpinnerComponent ] + declarations: [FullPageSpinnerComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/ui/full-page-spinner/full-page-spinner.component.ts b/src/app/ui/full-page-spinner/full-page-spinner.component.ts index 08b705219a..3a07f445ca 100644 --- a/src/app/ui/full-page-spinner/full-page-spinner.component.ts +++ b/src/app/ui/full-page-spinner/full-page-spinner.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ChangeDetectionStrategy, Input, HostBinding} from '@angular/core'; +import {ChangeDetectionStrategy, Component, HostBinding} from '@angular/core'; import {fadeAnimation} from '../animations/fade.ani'; @Component({ diff --git a/src/app/ui/help-section/help-section.component.ts b/src/app/ui/help-section/help-section.component.ts index 29bae3fd84..79e898c06c 100644 --- a/src/app/ui/help-section/help-section.component.ts +++ b/src/app/ui/help-section/help-section.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { expandFadeAnimation } from '../animations/expand.ani'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {expandFadeAnimation} from '../animations/expand.ani'; @Component({ selector: 'help-section', diff --git a/src/app/ui/inline-input/inline-input.component.spec.ts b/src/app/ui/inline-input/inline-input.component.spec.ts index cdd9c67286..9b3b47a29f 100644 --- a/src/app/ui/inline-input/inline-input.component.spec.ts +++ b/src/app/ui/inline-input/inline-input.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { InlineInputComponent } from './inline-input.component'; +import {InlineInputComponent} from './inline-input.component'; describe('InlineInputComponent', () => { let component: InlineInputComponent; @@ -8,9 +8,9 @@ describe('InlineInputComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ InlineInputComponent ] + declarations: [InlineInputComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/ui/inline-input/inline-input.component.ts b/src/app/ui/inline-input/inline-input.component.ts index 687cc6cfcb..228d4ea84e 100644 --- a/src/app/ui/inline-input/inline-input.component.ts +++ b/src/app/ui/inline-input/inline-input.component.ts @@ -22,8 +22,8 @@ export class InlineInputComponent { @Input() newValue: string | number; @Output() changed = new EventEmitter(); - @ViewChild('inputEl', { static: false }) inputEl: ElementRef; - @ViewChild('inputElDuration', { static: false }) inputElDuration: ElementRef; + @ViewChild('inputEl', {static: false}) inputEl: ElementRef; + @ViewChild('inputElDuration', {static: false}) inputElDuration: ElementRef; @HostBinding('class.isFocused') isFocused = false; diff --git a/src/app/ui/inline-markdown/inline-markdown.component.ts b/src/app/ui/inline-markdown/inline-markdown.component.ts index 0a86bc3488..3046c96cd5 100644 --- a/src/app/ui/inline-markdown/inline-markdown.component.ts +++ b/src/app/ui/inline-markdown/inline-markdown.component.ts @@ -10,10 +10,10 @@ import { Output, ViewChild } from '@angular/core'; -import { fadeAnimation } from '../animations/fade.ani'; -import { MarkdownComponent } from 'ngx-markdown'; -import { IS_ELECTRON } from '../../app.constants'; -import { ElectronService } from 'ngx-electron'; +import {fadeAnimation} from '../animations/fade.ani'; +import {MarkdownComponent} from 'ngx-markdown'; +import {IS_ELECTRON} from '../../app.constants'; +import {ElectronService} from 'ngx-electron'; const HIDE_OVERFLOW_TIMEOUT_DURATION = 300; @@ -30,9 +30,9 @@ export class InlineMarkdownComponent implements OnInit, OnDestroy { @Output() changed: EventEmitter = new EventEmitter(); @Output() focus: EventEmitter = new EventEmitter(); @Output() blur: EventEmitter = new EventEmitter(); - @ViewChild('wrapperEl', { static: true }) wrapperEl: ElementRef; - @ViewChild('textareaEl', { static: false }) textareaEl: ElementRef; - @ViewChild('previewEl', { static: true }) previewEl: MarkdownComponent; + @ViewChild('wrapperEl', {static: true}) wrapperEl: ElementRef; + @ViewChild('textareaEl', {static: false}) textareaEl: ElementRef; + @ViewChild('previewEl', {static: true}) previewEl: MarkdownComponent; isHideOverflow = false; isShowEdit = false; diff --git a/src/app/ui/pipes/humanize-timestamp.pipe.spec.ts b/src/app/ui/pipes/humanize-timestamp.pipe.spec.ts index fe0a5a1e5e..846c84fada 100644 --- a/src/app/ui/pipes/humanize-timestamp.pipe.spec.ts +++ b/src/app/ui/pipes/humanize-timestamp.pipe.spec.ts @@ -1,4 +1,4 @@ -import { HumanizeTimestampPipe } from './humanize-timestamp.pipe'; +import {HumanizeTimestampPipe} from './humanize-timestamp.pipe'; describe('HumanizeTimestampPipe', () => { it('create an instance', () => { diff --git a/src/app/ui/pipes/humanize-timestamp.pipe.ts b/src/app/ui/pipes/humanize-timestamp.pipe.ts index e5de067d89..1f1b391b71 100644 --- a/src/app/ui/pipes/humanize-timestamp.pipe.ts +++ b/src/app/ui/pipes/humanize-timestamp.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import * as moment from 'moment-mini'; diff --git a/src/app/ui/pipes/keys.pipe.spec.ts b/src/app/ui/pipes/keys.pipe.spec.ts index 9232fbfdb3..c5d8cc0aa8 100644 --- a/src/app/ui/pipes/keys.pipe.spec.ts +++ b/src/app/ui/pipes/keys.pipe.spec.ts @@ -1,4 +1,4 @@ -import { KeysPipe } from './keys.pipe'; +import {KeysPipe} from './keys.pipe'; describe('KeysPipe', () => { it('create an instance', () => { diff --git a/src/app/ui/pipes/keys.pipe.ts b/src/app/ui/pipes/keys.pipe.ts index 8bc48082f0..2ef3c76bcc 100644 --- a/src/app/ui/pipes/keys.pipe.ts +++ b/src/app/ui/pipes/keys.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; @Pipe({ name: 'keys', diff --git a/src/app/ui/pipes/moment-format.pipe.spec.ts b/src/app/ui/pipes/moment-format.pipe.spec.ts index 9fa41fc829..31336a1532 100644 --- a/src/app/ui/pipes/moment-format.pipe.spec.ts +++ b/src/app/ui/pipes/moment-format.pipe.spec.ts @@ -1,4 +1,4 @@ -import { MomentFormatPipe } from './moment-format.pipe'; +import {MomentFormatPipe} from './moment-format.pipe'; describe('MomentFormatPipe', () => { it('create an instance', () => { diff --git a/src/app/ui/pipes/moment-format.pipe.ts b/src/app/ui/pipes/moment-format.pipe.ts index 59f458a9fe..303885f448 100644 --- a/src/app/ui/pipes/moment-format.pipe.ts +++ b/src/app/ui/pipes/moment-format.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import * as moment from 'moment-mini'; @Pipe({ diff --git a/src/app/ui/pipes/number-to-month.pipe.ts b/src/app/ui/pipes/number-to-month.pipe.ts index 0753e5d3ba..5691a2140a 100644 --- a/src/app/ui/pipes/number-to-month.pipe.ts +++ b/src/app/ui/pipes/number-to-month.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; const MAP = [ 'January', diff --git a/src/app/ui/pipes/to-array.pipe.spec.ts b/src/app/ui/pipes/to-array.pipe.spec.ts index c208b28d84..ed2951b797 100644 --- a/src/app/ui/pipes/to-array.pipe.spec.ts +++ b/src/app/ui/pipes/to-array.pipe.spec.ts @@ -1,4 +1,4 @@ -import { ToArrayPipe } from './to-array.pipe'; +import {ToArrayPipe} from './to-array.pipe'; describe('ToArrayPipe', () => { it('create an instance', () => { diff --git a/src/app/ui/pipes/to-array.pipe.ts b/src/app/ui/pipes/to-array.pipe.ts index 97b1de73a6..1a0f5252f6 100644 --- a/src/app/ui/pipes/to-array.pipe.ts +++ b/src/app/ui/pipes/to-array.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; @Pipe({ name: 'toArray', diff --git a/src/app/ui/progress-bar/progress-bar.component.ts b/src/app/ui/progress-bar/progress-bar.component.ts index e02cc76276..c110d2fb3b 100644 --- a/src/app/ui/progress-bar/progress-bar.component.ts +++ b/src/app/ui/progress-bar/progress-bar.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, ElementRef, HostBinding, Input } from '@angular/core'; +import {ChangeDetectionStrategy, Component, ElementRef, HostBinding, Input} from '@angular/core'; @Component({ selector: 'progress-bar', diff --git a/src/app/ui/simple-download/simple-download.directive.ts b/src/app/ui/simple-download/simple-download.directive.ts index 9c47bd20b4..8cb2103383 100644 --- a/src/app/ui/simple-download/simple-download.directive.ts +++ b/src/app/ui/simple-download/simple-download.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, HostListener, Input } from '@angular/core'; +import {Directive, ElementRef, HostListener, Input} from '@angular/core'; @Directive({ selector: '[simpleDownload]' diff --git a/src/app/ui/theme-select/theme-select.component.ts b/src/app/ui/theme-select/theme-select.component.ts index 2aaf70d370..338833e68a 100644 --- a/src/app/ui/theme-select/theme-select.component.ts +++ b/src/app/ui/theme-select/theme-select.component.ts @@ -1,6 +1,5 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { ALL_THEMES } from '../../app.constants'; - +import {ChangeDetectionStrategy, Component} from '@angular/core'; +import {ALL_THEMES} from '../../app.constants'; @Component({ diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 849b76897e..4605e7f964 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -5,30 +5,30 @@ import {DurationFromStringPipe} from './duration/duration-from-string.pipe'; import {DurationToStringPipe} from './duration/duration-to-string.pipe'; import {EditOnClickDirective} from './edit-on-click/edit-on-click.directive'; import {InlineMarkdownComponent} from './inline-markdown/inline-markdown.component'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatBadgeModule } from '@angular/material/badge'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatNativeDateModule, MatOptionModule, MatRippleModule } from '@angular/material/core'; -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatStepperModule } from '@angular/material/stepper'; -import { MatTableModule } from '@angular/material/table'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import {MatAutocompleteModule} from '@angular/material/autocomplete'; +import {MatBadgeModule} from '@angular/material/badge'; +import {MatButtonModule} from '@angular/material/button'; +import {MatCardModule} from '@angular/material/card'; +import {MatCheckboxModule} from '@angular/material/checkbox'; +import {MatChipsModule} from '@angular/material/chips'; +import {MatNativeDateModule, MatOptionModule, MatRippleModule} from '@angular/material/core'; +import {MatDatepickerModule} from '@angular/material/datepicker'; +import {MatDialogModule} from '@angular/material/dialog'; +import {MatExpansionModule} from '@angular/material/expansion'; +import {MatFormFieldModule} from '@angular/material/form-field'; +import {MatIconModule} from '@angular/material/icon'; +import {MatInputModule} from '@angular/material/input'; +import {MatListModule} from '@angular/material/list'; +import {MatMenuModule} from '@angular/material/menu'; +import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import {MatSelectModule} from '@angular/material/select'; +import {MatSlideToggleModule} from '@angular/material/slide-toggle'; +import {MatStepperModule} from '@angular/material/stepper'; +import {MatTableModule} from '@angular/material/table'; +import {MatTabsModule} from '@angular/material/tabs'; +import {MatToolbarModule} from '@angular/material/toolbar'; +import {MatTooltipModule} from '@angular/material/tooltip'; import {MarkdownModule, MarkdownService} from 'ngx-markdown'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {FormlyMaterialModule} from '@ngx-formly/material'; @@ -61,7 +61,7 @@ import {InlineInputComponent} from './inline-input/inline-input.component'; import {ChipListInputComponent} from './chip-list-input/chip-list-input.component'; import {ValidationModule} from './validation/validation.module'; import {OwlDateTimeModule, OwlNativeDateTimeModule} from 'ng-pick-datetime'; -import { FullPageSpinnerComponent } from './full-page-spinner/full-page-spinner.component'; +import {FullPageSpinnerComponent} from './full-page-spinner/full-page-spinner.component'; @NgModule({ imports: [ diff --git a/src/app/util/get-weeks-in-month.spec.ts b/src/app/util/get-weeks-in-month.spec.ts index 763b081628..ab9aee8d9f 100644 --- a/src/app/util/get-weeks-in-month.spec.ts +++ b/src/app/util/get-weeks-in-month.spec.ts @@ -1,4 +1,4 @@ -import { getWeeksInMonth } from './get-weeks-in-month'; +import {getWeeksInMonth} from './get-weeks-in-month'; describe('getWeeksInMonth', () => { it('should work for february 2019', () => { diff --git a/src/app/util/get-work-log-str.ts b/src/app/util/get-work-log-str.ts index 611d919d24..0bfa864a32 100644 --- a/src/app/util/get-work-log-str.ts +++ b/src/app/util/get-work-log-str.ts @@ -1,6 +1,6 @@ import * as moment from 'moment-mini'; -import { WORKLOG_DATE_STR_FORMAT } from '../app.constants'; +import {WORKLOG_DATE_STR_FORMAT} from '../app.constants'; export const getWorklogStr = (date: Date | number | string = new Date()): string => { return moment(date).format(WORKLOG_DATE_STR_FORMAT); diff --git a/src/app/util/round-time.ts b/src/app/util/round-time.ts index a5f80b0458..e5cde9e6e7 100644 --- a/src/app/util/round-time.ts +++ b/src/app/util/round-time.ts @@ -1,5 +1,5 @@ -import { RoundTimeOption } from '../features/project/project.model'; -import { Moment } from 'moment-mini'; +import {RoundTimeOption} from '../features/project/project.model'; +import {Moment} from 'moment-mini'; export const roundTime = (val: number | Date, roundTo: RoundTimeOption, isRoundUp = false): Date => { const value = (typeof val === 'number') diff --git a/src/assets/fonts/MaterialIcons-Regular.svg b/src/assets/fonts/MaterialIcons-Regular.svg index 4a1b7e498d..5eff3dddba 100644 --- a/src/assets/fonts/MaterialIcons-Regular.svg +++ b/src/assets/fonts/MaterialIcons-Regular.svg @@ -4,2372 +4,2372 @@ 2016-2-8: Created with FontForge (http://fontforge.org) --> - - Created by FontForge 20151118 at Mon Feb 8 11:58:02 2016 - By shyndman - Copyright 2015 Google, Inc. All Rights Reserved. - - - - - - + + + - - - - - - + + - - + - - + - - - + - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + + - - - - - + + + - - - - - - + - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + - - - + + - - - - - + + - - - - - - - + + + + + + - - - - - + + + - - - + + - - - - - - - - - + + + + - - - + - - - - + - - + - - - - - - - - - + + + + + + + - - + - - - - - - + + + + + - - - + + - - - + - - + - - - - - - - - + + + + + + + - - - - - + - - + - - + - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + - - - - - + + + + - - - - - - + + + + - - - - - - - + + + + + + - - - - + - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + - - - - - - - - - - + + + + + + + + + - - - - + + + - - - - + - - - - - + - - - - - + - - - - - - + + + + + - - - - - - - + + + + + + - - - - - - + + + + - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - + - - - - - - - + + + - - - - + + + - - + - - - - - - - + + + + + - - - + - - - + - - - - + - - - - - - + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - + + + + + + + - - - - - - - + + + + - - - - + + + - - - + + - - + - - + - - + - - - + - - - - - - + - - - - - - + + + + - - - - - - + - - - + + - - - - - + + + + - - - + + - - + - - - - - - - - - + + + + + + + + - - - - - + + + + - - + - - - - - - - + + + + + + - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + - - - - - + + + - - - - - - + + + - - + - - + - - + - - - + + - - - - + + + - - - - - + + - - + - - - - - - - + + + + + + - - - + + - - - - - - - - + + - - - - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + - - - - - + + + + - - - - - + + + - - - - - - - - + + - - - - - + + + + - - - - + + + - - + - - - - - - + + + + + - - - - - + + + - - - - - - - + + + + + + - - + - - - - - - - - - + + + + + + + + - - - - - + + - - - - - - - - + + + + - - - - - - + - - + - - - - + + + - - - - + - - - + + - - - - + - - - - - + + - - - + - - - + + - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - + - - - - - - - + + + + + + - - - - - - + + + + - - - - - - - - - - + + + + + + + - - - - + + - - - - - - - + - - - - - - + + + + + - - - - - - - - - + + + + + - - + - - - - - - - - - + - - - + + - - - - + - - + - - - - - - - - + + - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + - - + - - - - + + - - - + + - - + - - - - + + - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + - - - - - - - - + + + + + - - - - - - - - - - + + + + + + + - - - - - + + + - - - - + + + - - - - - - - - - - + + + + + + + + - - - + - - - - - - - - + + + - - - - + - - - - - - + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + - - - - - - - - + + + + + + + - - + - - - + - - - + + - - - + + - - - - - - - - - + + + + + + + - - - - + + - - - - + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/drag-handle.svg b/src/assets/icons/drag-handle.svg index 179b89f20f..2f2b5e1255 100644 --- a/src/assets/icons/drag-handle.svg +++ b/src/assets/icons/drag-handle.svg @@ -1,9 +1,9 @@ - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/assets/icons/github.svg b/src/assets/icons/github.svg index df6eb5b331..297efad5d6 100644 --- a/src/assets/icons/github.svg +++ b/src/assets/icons/github.svg @@ -1,5 +1,5 @@ - + diff --git a/src/assets/icons/jira.svg b/src/assets/icons/jira.svg index 96add78620..3177af5f50 100644 --- a/src/assets/icons/jira.svg +++ b/src/assets/icons/jira.svg @@ -1,43 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - + d="M103.1 24.9c-6 0-10.9 4.9-10.9 10.9s4.9 10.9 10.9 10.9S114 41.8 114 35.8c-.1-6-4.9-10.9-10.9-10.9z" + id="path25" fill="currentColor"/> + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/play.svg b/src/assets/icons/play.svg index 75277a51c4..566784e9c7 100644 --- a/src/assets/icons/play.svg +++ b/src/assets/icons/play.svg @@ -3,6 +3,6 @@ version="1.1" fill="currentColor" viewBox="0 0 24 24"> - + diff --git a/src/assets/icons/sp.svg b/src/assets/icons/sp.svg index 79acd91a38..2c17dd8ba5 100644 --- a/src/assets/icons/sp.svg +++ b/src/assets/icons/sp.svg @@ -1,7 +1,7 @@ - + diff --git a/src/assets/web-workers/reminder.js b/src/assets/web-workers/reminder.js index d50c6d994e..dd6b614dd0 100644 --- a/src/assets/web-workers/reminder.js +++ b/src/assets/web-workers/reminder.js @@ -3,7 +3,7 @@ const MESSAGE_INTERVAL_DURATION = 10000; let currentMessageTimerVal = 0; let checkInterval; -self.onmessage = function(msg) { +self.onmessage = function (msg) { reInitCheckInterval(msg.data); }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 48290c9a13..8fd142f928 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,4 +1,5 @@ -import { version } from '../../package.json'; +import {version} from '../../package.json'; + export const environment = { production: true, version, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index dcc0405581..7c5ae60b50 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,7 +1,7 @@ // This file can be replaced during build by using the `fileReplacements` array. // `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`. // The list of file replacements can be found in `angular.json`. -import { version } from '../../package.json'; +import {version} from '../../package.json'; export const environment = { production: false, diff --git a/src/hammer-config.class.ts b/src/hammer-config.class.ts index 2780752d11..510f5ac57c 100644 --- a/src/hammer-config.class.ts +++ b/src/hammer-config.class.ts @@ -1,4 +1,4 @@ -import { HammerGestureConfig } from '@angular/platform-browser'; +import {HammerGestureConfig} from '@angular/platform-browser'; export class MyHammerConfig extends HammerGestureConfig { overrides = { diff --git a/src/index.html b/src/index.html index dd6a9c48e9..a8ee6716e1 100644 --- a/src/index.html +++ b/src/index.html @@ -15,7 +15,8 @@ name="theme-color"> - +