diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index 0c99d27..f165dad 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -40,6 +40,10 @@ app-sidebar-mobile {
filter: blur(5px);
}
+.d-none {
+ display: none;
+}
+
@media screen and (max-width: 910px) {
.main-content {
padding: 32px;
diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index f5da097..5776752 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -14,6 +14,7 @@ export const routes: Routes = [
{ path: 'summary', component: SummaryComponent },
{ path: 'add-task', component: AddTaskComponent },
{ path: 'board', component: BoardComponent },
+ { path: 'task/:id', component: TaskOverlayComponent },
{ path: 'contacts', component: ContactsComponent },
{ path: 'contacts/:id', component: ContactsComponent },
{ path: 'help', component: HelpComponent },
diff --git a/src/app/components/add-task/add-task.component.ts b/src/app/components/add-task/add-task.component.ts
index 5eca37f..2f88202 100644
--- a/src/app/components/add-task/add-task.component.ts
+++ b/src/app/components/add-task/add-task.component.ts
@@ -172,7 +172,7 @@ export class AddTaskComponent {
}
closeOverlay() {
- this.overlayService.setOverlayData('', '', false);
+ this.overlayService.setOverlayData('', '');
}
untouchedFormFields() {
diff --git a/src/app/components/board/task/task.component.ts b/src/app/components/board/task/task.component.ts
index 795c9b3..279eb53 100644
--- a/src/app/components/board/task/task.component.ts
+++ b/src/app/components/board/task/task.component.ts
@@ -30,9 +30,9 @@ export class TaskComponent {
openTaskDetailsOverlay(taskId: string | undefined) {
if (window.innerWidth >= 650) {
- this.overlayService.setOverlayData('taskOverlay', taskId, false);
+ this.overlayService.setOverlayData('taskOverlay', taskId);
} else {
- this.overlayService.setOverlayData('taskOverlay', taskId, true);
+ this.router.navigate(['/task', taskId]);
}
}
diff --git a/src/app/services/overlay.service.ts b/src/app/services/overlay.service.ts
index bb71ddc..51918b6 100644
--- a/src/app/services/overlay.service.ts
+++ b/src/app/services/overlay.service.ts
@@ -10,7 +10,7 @@ export class OverlayService {
constructor() {}
- setOverlayData(overlay: string, data: any, mobile: boolean) {
- this.overlayDataSubject.next({ overlay, data, mobile });
+ setOverlayData(overlay: string, data: any) {
+ this.overlayDataSubject.next({ overlay, data });
}
}
diff --git a/src/app/shared/components/buttons/btn-back/btn-back.component.html b/src/app/shared/components/buttons/btn-back/btn-back.component.html
index 64d9478..b5e6ae3 100644
--- a/src/app/shared/components/buttons/btn-back/btn-back.component.html
+++ b/src/app/shared/components/buttons/btn-back/btn-back.component.html
@@ -1 +1,3 @@
-
+
+

+
diff --git a/src/app/shared/components/buttons/btn-back/btn-back.component.scss b/src/app/shared/components/buttons/btn-back/btn-back.component.scss
index 771d185..b382199 100644
--- a/src/app/shared/components/buttons/btn-back/btn-back.component.scss
+++ b/src/app/shared/components/buttons/btn-back/btn-back.component.scss
@@ -1,12 +1,24 @@
-img {
- width: 32px;
- height: 32px;
+.btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 38px;
+ height: 38px;
cursor: pointer;
- margin-left: 48px;
+ img {
+ width: 22px;
+ height: 22px;
+ filter: brightness(0) saturate(100%) invert(56%) sepia(64%) saturate(570%)
+ hue-rotate(154deg) brightness(92%) contrast(92%);
+ }
&:hover {
- width: 36px;
- height: 36px;
- background-color: var(--light-gray);
- border-radius: 18px;
+ background-color: var(--light-blue);
+ border-radius: 100%;
+ scale: 1.1;
+ img {
+ scale: 1.1;
+ filter: brightness(0) saturate(100%) invert(100%) sepia(0%)
+ saturate(7485%) hue-rotate(325deg) brightness(100%) contrast(104%);
+ }
}
}
diff --git a/src/app/shared/components/buttons/btn-close/btn-close.component.html b/src/app/shared/components/buttons/btn-close/btn-close.component.html
index d9fb310..2b55494 100644
--- a/src/app/shared/components/buttons/btn-close/btn-close.component.html
+++ b/src/app/shared/components/buttons/btn-close/btn-close.component.html
@@ -1,3 +1,3 @@
-
-

+
+
diff --git a/src/app/shared/components/buttons/btn-close/btn-close.component.scss b/src/app/shared/components/buttons/btn-close/btn-close.component.scss
index c79bfc8..b382199 100644
--- a/src/app/shared/components/buttons/btn-close/btn-close.component.scss
+++ b/src/app/shared/components/buttons/btn-close/btn-close.component.scss
@@ -2,21 +2,23 @@
display: flex;
justify-content: center;
align-items: center;
- width: 40px;
- height: 40px;
+ width: 38px;
+ height: 38px;
cursor: pointer;
img {
- width: 32px;
- height: 32px;
+ width: 22px;
+ height: 22px;
filter: brightness(0) saturate(100%) invert(56%) sepia(64%) saturate(570%)
hue-rotate(154deg) brightness(92%) contrast(92%);
}
&:hover {
- background-color: var(--light-gray);
+ background-color: var(--light-blue);
border-radius: 100%;
scale: 1.1;
img {
scale: 1.1;
+ filter: brightness(0) saturate(100%) invert(100%) sepia(0%)
+ saturate(7485%) hue-rotate(325deg) brightness(100%) contrast(104%);
}
}
}
diff --git a/src/app/shared/components/overlay/overlay.component.html b/src/app/shared/components/overlay/overlay.component.html
index afa1a56..8253fee 100644
--- a/src/app/shared/components/overlay/overlay.component.html
+++ b/src/app/shared/components/overlay/overlay.component.html
@@ -1,11 +1,8 @@
-
+@if (overlayData) {
+
@if (overlayType === "taskOverlay") {
} @if (overlayType === "taskOverlayEdit") {
@@ -15,3 +12,4 @@
>
}
+}
diff --git a/src/app/shared/components/overlay/overlay.component.ts b/src/app/shared/components/overlay/overlay.component.ts
index 34627b1..8ae68b7 100644
--- a/src/app/shared/components/overlay/overlay.component.ts
+++ b/src/app/shared/components/overlay/overlay.component.ts
@@ -22,15 +22,9 @@ import { ActivatedRoute } from '@angular/router';
templateUrl: './overlay.component.html',
styleUrl: './overlay.component.scss',
})
-export class OverlayComponent implements OnInit, OnDestroy {
- @HostBinding('class.overlay') isOverlay = window.innerWidth >= 650;
- @HostBinding('class.overlay-mobile') isOverlayMobile =
- window.innerWidth < 650;
- private resizeListener!: () => void;
-
+export class OverlayComponent implements OnInit {
overlayType: any;
overlayData: any;
- overlayMobile: boolean = false;
constructor(
private overlayService: OverlayService,
@@ -39,7 +33,6 @@ export class OverlayComponent implements OnInit, OnDestroy {
ngOnInit(): void {
this.checkOverlayData();
- this.checkWindowWidth();
}
checkOverlayData() {
@@ -47,19 +40,10 @@ export class OverlayComponent implements OnInit, OnDestroy {
if (data) {
this.overlayType = data.overlay;
this.overlayData = data.data;
- this.overlayMobile = data.mobile;
}
});
}
- checkWindowWidth() {
- this.resizeListener = () => {
- this.isOverlay = window.innerWidth >= 650;
- this.isOverlayMobile = window.innerWidth < 650;
- };
- window.addEventListener('resize', this.resizeListener);
- }
-
onCloseOverlay(emitter: string) {
this.overlayData = emitter;
}
@@ -74,8 +58,4 @@ export class OverlayComponent implements OnInit, OnDestroy {
this.onCloseOverlay('');
}
}
-
- ngOnDestroy(): void {
- window.removeEventListener('resize', this.resizeListener);
- }
}
diff --git a/src/app/shared/components/overlay/task-overlay/task-overlay.component.html b/src/app/shared/components/overlay/task-overlay/task-overlay.component.html
index 194feb7..ff23268 100644
--- a/src/app/shared/components/overlay/task-overlay/task-overlay.component.html
+++ b/src/app/shared/components/overlay/task-overlay/task-overlay.component.html
@@ -3,6 +3,7 @@
overlay: !overlayMobile,
'overlay-mobile': overlayMobile,
}"
+ *ngIf="overlayData !== '' && getTaskData(overlayData).length > 0"
>
();
+ overlayMobile: boolean = false;
+
constructor(
public firebaseService: FirebaseService,
- private overlayService: OverlayService
+ private overlayService: OverlayService,
+ private route: ActivatedRoute
) {}
categoryColors = new Map
([
@@ -30,8 +34,19 @@ export class TaskOverlayComponent {
this.closeDialogEmitter.emit('');
}
+ ngOnInit() {
+ if (this.overlayData == '') {
+ if (this.route.params.subscribe()) {
+ this.route.params.subscribe((params) => {
+ this.overlayData = params['id'];
+ this.overlayMobile = true;
+ });
+ }
+ }
+ }
+
editTask(overlayData: string) {
- this.overlayService.setOverlayData('taskOverlayEdit', overlayData, false);
+ this.overlayService.setOverlayData('taskOverlayEdit', overlayData);
}
deleteTask(overlayData: string) {
diff --git a/src/assets/img/arrow-left.svg b/src/assets/img/arrow-left.svg
index 4b70ce0..47eced3 100644
--- a/src/assets/img/arrow-left.svg
+++ b/src/assets/img/arrow-left.svg
@@ -1,5 +1,3 @@
-