added & display task creator
This commit is contained in:
parent
25b56d2d9c
commit
d2c5521b9b
7 changed files with 70 additions and 13 deletions
|
|
@ -34,12 +34,12 @@ export const appConfig: ApplicationConfig = {
|
||||||
importProvidersFrom(
|
importProvidersFrom(
|
||||||
provideFirebaseApp(() =>
|
provideFirebaseApp(() =>
|
||||||
initializeApp({
|
initializeApp({
|
||||||
projectId: 'join-c681c',
|
apiKey: 'AIzaSyD2b7I0ZeveC_EgNW58-axDI4lk5ZVlCLQ',
|
||||||
appId: '1:400675412426:web:cb85b11123b40713ad5733',
|
authDomain: 'join-a5f8f.firebaseapp.com',
|
||||||
storageBucket: 'join-c681c.appspot.com',
|
projectId: 'join-a5f8f',
|
||||||
apiKey: 'AIzaSyCflbtIlrAaEW9GUrkeEnSBJdqVwtPYquQ',
|
storageBucket: 'join-a5f8f.appspot.com',
|
||||||
authDomain: 'join-c681c.firebaseapp.com',
|
messagingSenderId: '3386291568',
|
||||||
messagingSenderId: '400675412426',
|
appId: '1:3386291568:web:6e54dc4138824f24648bb5',
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ import { OverlayService } from '../../services/overlay.service';
|
||||||
import { empty } from 'rxjs';
|
import { empty } from 'rxjs';
|
||||||
import { FormBtnComponent } from '../../shared/components/buttons/form-btn/form-btn.component';
|
import { FormBtnComponent } from '../../shared/components/buttons/form-btn/form-btn.component';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
|
import { SharedService } from '../../services/shared.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-add-task',
|
selector: 'app-add-task',
|
||||||
|
|
@ -43,7 +44,8 @@ export class AddTaskComponent implements OnInit {
|
||||||
constructor(
|
constructor(
|
||||||
public firebaseService: FirebaseService,
|
public firebaseService: FirebaseService,
|
||||||
private overlayService: OverlayService,
|
private overlayService: OverlayService,
|
||||||
private route: ActivatedRoute
|
private route: ActivatedRoute,
|
||||||
|
private sharedService: SharedService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
taskData: Task = {
|
taskData: Task = {
|
||||||
|
|
@ -55,6 +57,7 @@ export class AddTaskComponent implements OnInit {
|
||||||
subtasksTitle: [],
|
subtasksTitle: [],
|
||||||
subtasksDone: [],
|
subtasksDone: [],
|
||||||
assigned: [],
|
assigned: [],
|
||||||
|
creator: this.sharedService.currentUserId,
|
||||||
date: this.currentDate,
|
date: this.currentDate,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ section {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
max-width: 1185px;
|
max-width: 1178px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.search {
|
.search {
|
||||||
|
|
@ -103,7 +103,7 @@ d-none {
|
||||||
/*------------- HEADLINE -------------*/
|
/*------------- HEADLINE -------------*/
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
max-width: 1185px;
|
max-width: 1210px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status {
|
.status {
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,11 @@
|
||||||
}
|
}
|
||||||
<div class="footer">
|
<div class="footer">
|
||||||
<div class="footer-badge">
|
<div class="footer-badge">
|
||||||
|
<span
|
||||||
|
class="footer-badged"
|
||||||
|
[style.background-color]="userBadgedColor(task.creator)"
|
||||||
|
>{{ userBadged(task.creator) }}</span
|
||||||
|
>
|
||||||
@for (assigned of task.assigned; track assigned) {
|
@for (assigned of task.assigned; track assigned) {
|
||||||
<span
|
<span
|
||||||
class="footer-badged"
|
class="footer-badged"
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,6 @@ export interface Task {
|
||||||
subtasksTitle: string[];
|
subtasksTitle: string[];
|
||||||
subtasksDone: boolean[];
|
subtasksDone: boolean[];
|
||||||
assigned: string[];
|
assigned: string[];
|
||||||
|
creator: string;
|
||||||
date: string;
|
date: string;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,51 @@
|
||||||
class="priority-bg prio-{{ getTaskData(overlayData)[0].priority }}"
|
class="priority-bg prio-{{ getTaskData(overlayData)[0].priority }}"
|
||||||
></div>
|
></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="creator">
|
||||||
|
<p>Creator:</p>
|
||||||
|
<div class="users">
|
||||||
|
<div
|
||||||
|
class="circle"
|
||||||
|
[ngStyle]="{
|
||||||
|
'background-color': firebaseService.getUserDetails(
|
||||||
|
getTaskData(overlayData)[0].creator,
|
||||||
|
'color'
|
||||||
|
)
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
<div class="initials">
|
||||||
|
{{
|
||||||
|
firebaseService.getUserDetails(
|
||||||
|
getTaskData(overlayData)[0].creator,
|
||||||
|
"initials"
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="details">
|
||||||
|
<div class="name">
|
||||||
|
<p>
|
||||||
|
{{
|
||||||
|
firebaseService.getUserDetails(
|
||||||
|
getTaskData(overlayData)[0].creator,
|
||||||
|
"firstName"
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</p>
|
||||||
|
<span> </span>
|
||||||
|
<p class="last-name">
|
||||||
|
{{
|
||||||
|
firebaseService.getUserDetails(
|
||||||
|
getTaskData(overlayData)[0].creator,
|
||||||
|
"lastName"
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@if (getTaskData(overlayData)[0].assigned.length > 0) {
|
||||||
<div class="assigned">
|
<div class="assigned">
|
||||||
<p>Assigned to:</p>
|
<p>Assigned to:</p>
|
||||||
@for (user of getTaskData(overlayData)[0].assigned; track user) {
|
@for (user of getTaskData(overlayData)[0].assigned; track user) {
|
||||||
|
|
@ -60,7 +105,7 @@
|
||||||
<p>
|
<p>
|
||||||
{{ firebaseService.getUserDetails(user, "firstName") }}
|
{{ firebaseService.getUserDetails(user, "firstName") }}
|
||||||
</p>
|
</p>
|
||||||
<span>, </span>
|
<span> </span>
|
||||||
<p class="last-name">
|
<p class="last-name">
|
||||||
{{ firebaseService.getUserDetails(user, "lastName") }}
|
{{ firebaseService.getUserDetails(user, "lastName") }}
|
||||||
</p>
|
</p>
|
||||||
|
|
@ -69,6 +114,7 @@
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
} @if (getTaskData(overlayData)[0].subtasksTitle.length > 0) {
|
||||||
<div class="subtasks">
|
<div class="subtasks">
|
||||||
<p>Subtasks:</p>
|
<p>Subtasks:</p>
|
||||||
@for (subtask of getTaskData(overlayData)[0].subtasksTitle; track subtask;
|
@for (subtask of getTaskData(overlayData)[0].subtasksTitle; track subtask;
|
||||||
|
|
@ -96,6 +142,7 @@
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
<div class="btns">
|
<div class="btns">
|
||||||
<div class="btn btn-delete" (click)="deleteTask(overlayData)">
|
<div class="btn btn-delete" (click)="deleteTask(overlayData)">
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.headline {
|
.headline {
|
||||||
font-size: 61px;
|
font-size: 46px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
|
|
@ -108,9 +108,10 @@
|
||||||
background-image: url(./../../../../../assets/img/low.svg);
|
background-image: url(./../../../../../assets/img/low.svg);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ASSIGNED
|
// ASSIGNED, CREATOR
|
||||||
|
|
||||||
.assigned {
|
.assigned,
|
||||||
|
.creator {
|
||||||
margin-top: 32px;
|
margin-top: 32px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
p {
|
p {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue