bugfixes & update design

This commit is contained in:
Chneemann 2024-04-28 09:12:14 +02:00
parent 3a05225e51
commit a4ff000e23
6 changed files with 26 additions and 8 deletions

View file

@ -45,6 +45,8 @@ select {
border: 1px solid var(--light-gray); border: 1px solid var(--light-gray);
padding: 12px 21px; padding: 12px 21px;
width: calc(100% - 42px); width: calc(100% - 42px);
color: var(--black);
background-color: var(--white);
resize: none; resize: none;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;

View file

@ -17,6 +17,13 @@
autocomplete="off" autocomplete="off"
required required
/> />
@if (sharedService.isContactViewMedia) {
<div class="error-msg">
@if (!firstName.valid && firstName.touched) {
<p>{{ "contact-dialog-form.invalid-firstName" | translate }}</p>
}
</div>
}
<input <input
id="lastName" id="lastName"
type="text" type="text"
@ -29,6 +36,13 @@
required required
/> />
</div> </div>
@if (sharedService.isContactViewMedia) {
<div class="error-msg">
@if (!lastName.valid && lastName.touched) {
<p>{{ "contact-dialog-form.invalid-lastName" | translate }}</p>
}
</div>
} @if (!sharedService.isContactViewMedia) {
<div class="error-msg"> <div class="error-msg">
@if ((!firstName.valid && firstName.touched) && (!lastName.valid && @if ((!firstName.valid && firstName.touched) && (!lastName.valid &&
lastName.touched)) { lastName.touched)) {
@ -39,6 +53,7 @@
<p>{{ "contact-dialog-form.invalid-lastName" | translate }}</p> <p>{{ "contact-dialog-form.invalid-lastName" | translate }}</p>
} } } } } }
</div> </div>
}
<input <input
id="email" id="email"
type="email" type="email"

View file

@ -17,7 +17,7 @@ export class ContactFormComponent implements OnChanges {
constructor( constructor(
private firebaseService: FirebaseService, private firebaseService: FirebaseService,
private sharedService: SharedService public sharedService: SharedService
) { ) {
this.updateContactData(); this.updateContactData();
} }

View file

@ -8,6 +8,7 @@ export class SharedService {
isEditContactDialogOpen: boolean = false; isEditContactDialogOpen: boolean = false;
isDeleteContactDialogOpen: boolean = false; isDeleteContactDialogOpen: boolean = false;
isPageViewMedia: boolean = window.innerWidth <= 650; isPageViewMedia: boolean = window.innerWidth <= 650;
isContactViewMedia: boolean = window.innerWidth <= 800;
currentUserId: string = ''; currentUserId: string = '';
private resizeListener!: () => void; private resizeListener!: () => void;
@ -29,6 +30,7 @@ export class SharedService {
private onResize() { private onResize() {
this.isPageViewMedia = window.innerWidth <= 650; this.isPageViewMedia = window.innerWidth <= 650;
this.isContactViewMedia = window.innerWidth <= 800;
} }
cleanup() { cleanup() {

View file

@ -7,11 +7,7 @@
@if (overlayType === 'newTaskOverlay' || (overlayData !== '' && @if (overlayType === 'newTaskOverlay' || (overlayData !== '' &&
getTaskData(overlayData).length > 0)) { getTaskData(overlayData).length > 0)) {
<div class="header"> <div class="header">
@if (overlayMobile) {
<app-btn-back></app-btn-back>
} @else {
<app-btn-close (click)="closeDialog()"></app-btn-close> <app-btn-close (click)="closeDialog()"></app-btn-close>
}
</div> </div>
<app-add-task <app-add-task
[overlayData]="overlayData" [overlayData]="overlayData"

View file

@ -8,7 +8,7 @@ import { CommonModule } from '@angular/common';
import { User } from '../../../../interfaces/user.interface'; import { User } from '../../../../interfaces/user.interface';
import { AssignedComponent } from '../../../../components/add-task/assigned/assigned.component'; import { AssignedComponent } from '../../../../components/add-task/assigned/assigned.component';
import { AddTaskComponent } from '../../../../components/add-task/add-task.component'; import { AddTaskComponent } from '../../../../components/add-task/add-task.component';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { BtnBackComponent } from '../../buttons/btn-back/btn-back.component'; import { BtnBackComponent } from '../../buttons/btn-back/btn-back.component';
@Component({ @Component({
@ -35,7 +35,8 @@ export class TaskEditOverlayComponent {
constructor( constructor(
public firebaseService: FirebaseService, public firebaseService: FirebaseService,
private overlayService: OverlayService, private overlayService: OverlayService,
private route: ActivatedRoute private route: ActivatedRoute,
private router: Router
) {} ) {}
ngOnInit() { ngOnInit() {
@ -57,7 +58,9 @@ export class TaskEditOverlayComponent {
} }
closeDialog() { closeDialog() {
this.closeDialogEmitter.emit(''); this.overlayMobile
? this.router.navigate(['/board'])
: this.closeDialogEmitter.emit('');
this.removeTaskData(); this.removeTaskData();
} }