diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index c330fbb..a0cd0d2 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -6,12 +6,14 @@ import { PrivacyPolicyComponent } from './shared/components/privacy-policy/priva import { AddTaskComponent } from './components/add-task/add-task.component'; import { BoardComponent } from './components/board/board.component'; import { ContactsComponent } from './components/contacts/contacts.component'; +import { OverlayComponent } from './shared/components/overlay/overlay.component'; export const routes: Routes = [ { path: '', component: SummaryComponent }, { path: 'summary', component: SummaryComponent }, { path: 'add-task', component: AddTaskComponent }, { path: 'board', component: BoardComponent }, + { path: 'board/:id', component: BoardComponent }, { 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 2f88202..5eca37f 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('', ''); + this.overlayService.setOverlayData('', '', false); } untouchedFormFields() { diff --git a/src/app/components/board/task/task.component.ts b/src/app/components/board/task/task.component.ts index acfacc2..795c9b3 100644 --- a/src/app/components/board/task/task.component.ts +++ b/src/app/components/board/task/task.component.ts @@ -4,6 +4,7 @@ import { DragDropService } from '../../../services/drag-drop.service'; import { Task } from '../../../interfaces/task.interface'; import { FirebaseService } from '../../../services/firebase.service'; import { OverlayService } from '../../../services/overlay.service'; +import { Router } from '@angular/router'; @Component({ selector: 'app-task', @@ -23,11 +24,16 @@ export class TaskComponent { constructor( public dragDropService: DragDropService, private firebaseService: FirebaseService, - public overlayService: OverlayService + public overlayService: OverlayService, + private router: Router ) {} openTaskDetailsOverlay(taskId: string | undefined) { - this.overlayService.setOverlayData('taskOverlay', taskId); + if (window.innerWidth >= 650) { + this.overlayService.setOverlayData('taskOverlay', taskId, false); + } else { + this.overlayService.setOverlayData('taskOverlay', taskId, true); + } } // Subtasks diff --git a/src/app/services/overlay.service.ts b/src/app/services/overlay.service.ts index 51918b6..bb71ddc 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) { - this.overlayDataSubject.next({ overlay, data }); + setOverlayData(overlay: string, data: any, mobile: boolean) { + this.overlayDataSubject.next({ overlay, data, mobile }); } } diff --git a/src/app/shared/components/overlay/overlay.component.html b/src/app/shared/components/overlay/overlay.component.html index a4fa47c..281cab7 100644 --- a/src/app/shared/components/overlay/overlay.component.html +++ b/src/app/shared/components/overlay/overlay.component.html @@ -1,8 +1,12 @@ -