diff --git a/libs/mix-lib/src/model/core/mix-task.model.ts b/libs/mix-lib/src/model/core/mix-task.model.ts index 40e3ab70..7ccfa481 100644 --- a/libs/mix-lib/src/model/core/mix-task.model.ts +++ b/libs/mix-lib/src/model/core/mix-task.model.ts @@ -8,7 +8,7 @@ export enum TaskStatus { export const TaskStatusDisplay = { [TaskStatus.BACKLOG]: 'Backlog', [TaskStatus.SELECTED]: 'Ready For Dev', - [TaskStatus.IN_PROGRESS]: 'In progress', + [TaskStatus.IN_PROGRESS]: 'In Progress', [TaskStatus.DONE]: 'Done', }; diff --git a/libs/mix-share/src/components/user-select/user-select.component.html b/libs/mix-share/src/components/user-select/user-select.component.html index 106022e4..3d6a5b66 100644 --- a/libs/mix-share/src/components/user-select/user-select.component.html +++ b/libs/mix-share/src/components/user-select/user-select.component.html @@ -1,6 +1,7 @@ Choose a users diff --git a/libs/mix-share/src/components/user-select/user-select.component.ts b/libs/mix-share/src/components/user-select/user-select.component.ts index c7eac3e4..693aefd5 100644 --- a/libs/mix-share/src/components/user-select/user-select.component.ts +++ b/libs/mix-share/src/components/user-select/user-select.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { Component, forwardRef, inject } from '@angular/core'; +import { Component, Input, forwardRef, inject } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { ControlValueAccessor, @@ -40,6 +40,8 @@ import { distinctUntilChanged, filter } from 'rxjs'; ], }) export class UserSelectComponent implements ControlValueAccessor { + @Input() public size: 'm' | 's' | 'l' = 'm'; + public mixApi = inject(MixApiFacadeService); public store = inject(UserInfoStore); public control = new FormControl(); diff --git a/libs/mix-share/src/modules/task-manage/components/task-card/task-card.component.scss b/libs/mix-share/src/modules/task-manage/components/task-card/task-card.component.scss index 26940f2e..c9d4de70 100644 --- a/libs/mix-share/src/modules/task-manage/components/task-card/task-card.component.scss +++ b/libs/mix-share/src/modules/task-manage/components/task-card/task-card.component.scss @@ -7,12 +7,13 @@ .task-card { padding: 10px; - border-radius: 0.125rem; + border-radius: 0.625rem; transition-property: all; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 0.1s; box-shadow: #091e4240 0 1px 2px; background-color: rgb(255, 255, 255); + border: 1px solid var(--border-color-default); &:hover { background-color: rgb(235 236 240); @@ -21,4 +22,5 @@ .task-card-wrap { cursor: grab; + transition: transform 250ms cubic-bezier(0, 0, 0.2, 1); } diff --git a/libs/mix-share/src/modules/task-manage/components/task-detail-modal/task-detail-modal.component.html b/libs/mix-share/src/modules/task-manage/components/task-detail-modal/task-detail-modal.component.html index 3f6b96aa..b72763c7 100644 --- a/libs/mix-share/src/modules/task-manage/components/task-detail-modal/task-detail-modal.component.html +++ b/libs/mix-share/src/modules/task-manage/components/task-detail-modal/task-detail-modal.component.html @@ -1,7 +1,6 @@ -
+
- + {{ task.type }}-{{ task.id }}
@@ -9,55 +8,70 @@
-
Description
+
Description
- + -
Comment(s)
+
Comment(s)
-
STATUS
+
STATUS
- + -
REPORTER
+
REPORTER
-
PRORITY
+
PRORITY
- +
Created at - {{ task.createdDateTime | mixDate | date: 'dd/MM/yyyy hh:mm' }} + {{ task.createdDateTime | mixDate | date : 'dd/MM/yyyy hh:mm' }}
Updated at - {{ task.lastModified | mixDate | date: 'dd/MM/yyyy hh:mm' || '--' }} + {{ task.lastModified | mixDate | date : 'dd/MM/yyyy hh:mm' || '--' }}
-
- Close +
+ Close - Save + Save - Save & Close + Save & Close
diff --git a/libs/mix-share/src/modules/task-manage/components/task-dnd-list/task-dnd-list.component.scss b/libs/mix-share/src/modules/task-manage/components/task-dnd-list/task-dnd-list.component.scss index 2c42fec7..d8437aae 100644 --- a/libs/mix-share/src/modules/task-manage/components/task-dnd-list/task-dnd-list.component.scss +++ b/libs/mix-share/src/modules/task-manage/components/task-dnd-list/task-dnd-list.component.scss @@ -19,9 +19,14 @@ .cdk-drag-preview { box-sizing: border-box; - border-radius: 4px; - box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), - 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12); + box-shadow: unset; + + .task-card-wrap { + box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), + 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12); + transform: rotate(5deg); + border-radius: 0.6rem; + } } .cdk-drag-placeholder { @@ -29,6 +34,7 @@ background-color: rgba(150, 150, 200, 0.1); border: 1px dashed #abc; margin: 5px; + border-radius: 0.6rem; .task-card { opacity: 0; diff --git a/libs/mix-share/src/modules/task-manage/components/task-header/task-header.component.scss b/libs/mix-share/src/modules/task-manage/components/task-header/task-header.component.scss index 0a37cd1f..dce6df09 100644 --- a/libs/mix-share/src/modules/task-manage/components/task-header/task-header.component.scss +++ b/libs/mix-share/src/modules/task-manage/components/task-header/task-header.component.scss @@ -10,8 +10,19 @@ min-width: var(--task-min-col-w); width: var(--task-col-w); background-color: var(--task-list-bg); - border-left: 6px solid var(--color); border-radius: 0.125rem; + display: flex; + gap: 8px; + padding-left: 4px; + + &::before { + display: block; + width: 6px; + height: 110%; + content: ''; + background-color: var(--color); + border-radius: 1rem; + } } .add-btn { diff --git a/libs/mix-share/src/modules/task-manage/components/task-parent-card/task-parent-card.component.html b/libs/mix-share/src/modules/task-manage/components/task-parent-card/task-parent-card.component.html index 00729860..75a26e3f 100644 --- a/libs/mix-share/src/modules/task-manage/components/task-parent-card/task-parent-card.component.html +++ b/libs/mix-share/src/modules/task-manage/components/task-parent-card/task-parent-card.component.html @@ -1,4 +1,4 @@ -
+
expand_more diff --git a/libs/mix-share/src/modules/task-manage/task-manage.component.scss b/libs/mix-share/src/modules/task-manage/task-manage.component.scss index 17a15692..ad1111c0 100644 --- a/libs/mix-share/src/modules/task-manage/task-manage.component.scss +++ b/libs/mix-share/src/modules/task-manage/task-manage.component.scss @@ -1,7 +1,7 @@ .task-manage { --task-min-col-w: 200px; --task-col-w: 320px; - --task-list-bg: rgb(244 245 247); + --task-list-bg: rgba(244, 244, 244, 1); --task-col-padding: 8px 16px; --task-col-collapse-w: 50px;