From e85283c8dbdd831d74ed67cb4f5b32ec35d99506 Mon Sep 17 00:00:00 2001 From: Chneemann Date: Sat, 18 May 2024 07:52:44 +0200 Subject: [PATCH] new contact edit function: new contact --- src/app/app.component.html | 9 ++++++++- src/app/app.component.ts | 4 ++-- .../contact-detail/contact-detail.component.ts | 10 +++++++--- .../contact-edit.component.html | 2 ++ .../contact-edit.component.scss | 0 .../contact-edit.component.spec.ts | 15 +++++++-------- .../contact-edit.component.ts | 6 +++--- .../contact-form/contact-form.component.html | 0 .../contact-form/contact-form.component.scss | 0 .../contact-form/contact-form.component.spec.ts | 0 .../contact-form/contact-form.component.ts | 6 +++--- .../components/contacts/contacts.component.html | 2 +- .../components/contacts/contacts.component.scss | 2 +- src/app/components/contacts/contacts.component.ts | 5 +++++ src/app/services/shared.service.ts | 1 + 15 files changed, 40 insertions(+), 22 deletions(-) rename src/app/components/contacts/{contact-edit => contact-edit-new}/contact-edit.component.html (97%) rename src/app/components/contacts/{contact-edit => contact-edit-new}/contact-edit.component.scss (100%) rename src/app/components/contacts/{contact-edit => contact-edit-new}/contact-edit.component.spec.ts (52%) rename src/app/components/contacts/{contact-edit => contact-edit-new}/contact-edit.component.ts (80%) rename src/app/components/contacts/{ => contact-edit-new}/contact-form/contact-form.component.html (100%) rename src/app/components/contacts/{ => contact-edit-new}/contact-form/contact-form.component.scss (100%) rename src/app/components/contacts/{ => contact-edit-new}/contact-form/contact-form.component.spec.ts (100%) rename src/app/components/contacts/{ => contact-edit-new}/contact-form/contact-form.component.ts (88%) diff --git a/src/app/app.component.html b/src/app/app.component.html index 889a007..547afb6 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -11,7 +11,14 @@ -@if (sharedService.isEditContactDialogOpen) { +@if (sharedService.isNewContactDialogOpen) { + +} @if (sharedService.isEditContactDialogOpen) {
@@ -27,3 +28,4 @@
+} diff --git a/src/app/components/contacts/contact-edit/contact-edit.component.scss b/src/app/components/contacts/contact-edit-new/contact-edit.component.scss similarity index 100% rename from src/app/components/contacts/contact-edit/contact-edit.component.scss rename to src/app/components/contacts/contact-edit-new/contact-edit.component.scss diff --git a/src/app/components/contacts/contact-edit/contact-edit.component.spec.ts b/src/app/components/contacts/contact-edit-new/contact-edit.component.spec.ts similarity index 52% rename from src/app/components/contacts/contact-edit/contact-edit.component.spec.ts rename to src/app/components/contacts/contact-edit-new/contact-edit.component.spec.ts index 1875134..8718313 100644 --- a/src/app/components/contacts/contact-edit/contact-edit.component.spec.ts +++ b/src/app/components/contacts/contact-edit-new/contact-edit.component.spec.ts @@ -1,18 +1,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContactEditComponent } from './contact-edit.component'; +import { ContactEditNewComponent } from './contact-edit.component'; describe('ContactEditComponent', () => { - let component: ContactEditComponent; - let fixture: ComponentFixture; + let component: ContactEditNewComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ContactEditComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(ContactEditComponent); + imports: [ContactEditNewComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(ContactEditNewComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/components/contacts/contact-edit/contact-edit.component.ts b/src/app/components/contacts/contact-edit-new/contact-edit.component.ts similarity index 80% rename from src/app/components/contacts/contact-edit/contact-edit.component.ts rename to src/app/components/contacts/contact-edit-new/contact-edit.component.ts index 275c9b1..65e4654 100644 --- a/src/app/components/contacts/contact-edit/contact-edit.component.ts +++ b/src/app/components/contacts/contact-edit-new/contact-edit.component.ts @@ -1,9 +1,9 @@ import { Component, Input } from '@angular/core'; -import { ContactFormComponent } from '../contact-form/contact-form.component'; import { CommonModule } from '@angular/common'; import { BtnCloseComponent } from '../../../shared/components/buttons/btn-close/btn-close.component'; import { FirebaseService } from '../../../services/firebase.service'; import { TranslateModule } from '@ngx-translate/core'; +import { ContactFormComponent } from './contact-form/contact-form.component'; @Component({ selector: 'app-contact-edit', @@ -17,8 +17,8 @@ import { TranslateModule } from '@ngx-translate/core'; templateUrl: './contact-edit.component.html', styleUrl: './contact-edit.component.scss', }) -export class ContactEditComponent { - @Input() currentUserId!: string; +export class ContactEditNewComponent { + @Input() currentUserId: string | undefined; constructor(public firebaseService: FirebaseService) {} } diff --git a/src/app/components/contacts/contact-form/contact-form.component.html b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html similarity index 100% rename from src/app/components/contacts/contact-form/contact-form.component.html rename to src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html diff --git a/src/app/components/contacts/contact-form/contact-form.component.scss b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.scss similarity index 100% rename from src/app/components/contacts/contact-form/contact-form.component.scss rename to src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.scss diff --git a/src/app/components/contacts/contact-form/contact-form.component.spec.ts b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.spec.ts similarity index 100% rename from src/app/components/contacts/contact-form/contact-form.component.spec.ts rename to src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.spec.ts diff --git a/src/app/components/contacts/contact-form/contact-form.component.ts b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts similarity index 88% rename from src/app/components/contacts/contact-form/contact-form.component.ts rename to src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts index 266f132..5a3ab84 100644 --- a/src/app/components/contacts/contact-form/contact-form.component.ts +++ b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { FormsModule, NgForm } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { SharedService } from '../../../services/shared.service'; -import { FirebaseService } from '../../../services/firebase.service'; -import { FormBtnComponent } from '../../../shared/components/buttons/form-btn/form-btn.component'; +import { SharedService } from '../../../../services/shared.service'; +import { FirebaseService } from '../../../../services/firebase.service'; +import { FormBtnComponent } from '../../../../shared/components/buttons/form-btn/form-btn.component'; @Component({ selector: 'app-contact-form', diff --git a/src/app/components/contacts/contacts.component.html b/src/app/components/contacts/contacts.component.html index bf4ff70..4b35ec3 100644 --- a/src/app/components/contacts/contacts.component.html +++ b/src/app/components/contacts/contacts.component.html @@ -3,7 +3,7 @@ class="left-frame" [ngClass]="{ 'd-none': !showAllUsers && currentUserId != undefined }" > -