added edit user component & shared service
This commit is contained in:
parent
b8ffece105
commit
f41f3dcfc7
18 changed files with 251 additions and 20 deletions
|
|
@ -1,3 +1,4 @@
|
||||||
|
<div [ngClass]="{ 'blur-background': sharedService.isAnyDialogOpen }">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<app-sidebar></app-sidebar>
|
<app-sidebar></app-sidebar>
|
||||||
<main>
|
<main>
|
||||||
|
|
@ -8,3 +9,9 @@
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
<app-sidebar-mobile></app-sidebar-mobile>
|
<app-sidebar-mobile></app-sidebar-mobile>
|
||||||
|
</div>
|
||||||
|
@if (sharedService.isEditDialogOpen) {
|
||||||
|
<app-contact-edit
|
||||||
|
[currentUserId]="sharedService.currentUserId"
|
||||||
|
></app-contact-edit>
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,10 @@ app-header {
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.blur-background {
|
||||||
|
filter: blur(5px);
|
||||||
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 910px) {
|
@media screen and (max-width: 910px) {
|
||||||
.main-content {
|
.main-content {
|
||||||
width: calc(100vw - 64px);
|
width: calc(100vw - 64px);
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,10 @@ import { HeaderComponent } from './shared/components/header/header.component';
|
||||||
import { SidebarComponent } from './shared/components/sidebar/sidebar.component';
|
import { SidebarComponent } from './shared/components/sidebar/sidebar.component';
|
||||||
import { LanguageService } from './services/language.service';
|
import { LanguageService } from './services/language.service';
|
||||||
import { SidebarMobileComponent } from './shared/components/sidebar/sidebar-mobile/sidebar-mobile.component';
|
import { SidebarMobileComponent } from './shared/components/sidebar/sidebar-mobile/sidebar-mobile.component';
|
||||||
|
import { ContactEditComponent } from './components/contacts/contact-edit/contact-edit.component';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { SharedService } from './services/shared.service';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
|
|
@ -13,14 +17,19 @@ import { SidebarMobileComponent } from './shared/components/sidebar/sidebar-mobi
|
||||||
HeaderComponent,
|
HeaderComponent,
|
||||||
SidebarComponent,
|
SidebarComponent,
|
||||||
SidebarMobileComponent,
|
SidebarMobileComponent,
|
||||||
|
ContactEditComponent,
|
||||||
|
CommonModule,
|
||||||
],
|
],
|
||||||
templateUrl: './app.component.html',
|
templateUrl: './app.component.html',
|
||||||
styleUrl: './app.component.scss',
|
styleUrl: './app.component.scss',
|
||||||
})
|
})
|
||||||
export class AppComponent {
|
export class AppComponent {
|
||||||
title = 'join';
|
title = 'join';
|
||||||
|
constructor(
|
||||||
constructor(public langService: LanguageService, private router: Router) {
|
public langService: LanguageService,
|
||||||
|
private router: Router,
|
||||||
|
public sharedService: SharedService
|
||||||
|
) {
|
||||||
this.router.events.subscribe((event) => {});
|
this.router.events.subscribe((event) => {});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,9 +34,9 @@
|
||||||
{{ userService.getUserDetails(currentUserId, "lastName") }}
|
{{ userService.getUserDetails(currentUserId, "lastName") }}
|
||||||
</div>
|
</div>
|
||||||
<div class="btns">
|
<div class="btns">
|
||||||
<div class="btn">
|
<div class="btn btn-edit">
|
||||||
<img src="./../../../../assets/img/contact/edit.svg" alt="" />
|
<img src="./../../../../assets/img/contact/edit.svg" alt="" />
|
||||||
<p>edit</p>
|
<p (click)="openEditDialog()">edit</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="btn">
|
<div class="btn">
|
||||||
<img src="./../../../../assets/img/contact/delete.svg" alt="" />
|
<img src="./../../../../assets/img/contact/delete.svg" alt="" />
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,44 @@
|
||||||
import { Component, EventEmitter, Input, Output } from '@angular/core';
|
import { Component, HostListener, Input } from '@angular/core';
|
||||||
import { UserService } from '../../../services/user.service';
|
import { UserService } from '../../../services/user.service';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { ContactsComponent } from '../contacts.component';
|
import { ContactsComponent } from '../contacts.component';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
import { ContactEditComponent } from '../contact-edit/contact-edit.component';
|
||||||
|
import { SharedService } from '../../../services/shared.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-contact-detail',
|
selector: 'app-contact-detail',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule, ContactsComponent],
|
imports: [CommonModule, ContactsComponent, ContactEditComponent],
|
||||||
templateUrl: './contact-detail.component.html',
|
templateUrl: './contact-detail.component.html',
|
||||||
styleUrl: './contact-detail.component.scss',
|
styleUrl: './contact-detail.component.scss',
|
||||||
})
|
})
|
||||||
export class ContactDetailComponent {
|
export class ContactDetailComponent {
|
||||||
@Input() currentUserId!: string;
|
@Input() currentUserId!: string | undefined;
|
||||||
|
|
||||||
constructor(public userService: UserService, private router: Router) {}
|
constructor(
|
||||||
|
public userService: UserService,
|
||||||
|
private router: Router,
|
||||||
|
public sharedService: SharedService
|
||||||
|
) {}
|
||||||
|
|
||||||
closeUserDetails() {
|
closeUserDetails() {
|
||||||
this.router.navigate(['contacts']);
|
this.router.navigate(['contacts']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
openEditDialog() {
|
||||||
|
this.sharedService.isEditDialogOpen = !this.sharedService.isEditDialogOpen;
|
||||||
|
}
|
||||||
|
|
||||||
|
@HostListener('document:click', ['$event'])
|
||||||
|
checkOpenContactEdit(event: MouseEvent) {
|
||||||
|
const targetElement = event.target as HTMLElement;
|
||||||
|
if (targetElement.closest('.btn-edit')) {
|
||||||
|
this.sharedService.isAnyDialogOpen = true;
|
||||||
|
this.sharedService.isEditDialogOpen = true;
|
||||||
|
} else if (!targetElement.closest('.dialog')) {
|
||||||
|
this.sharedService.isAnyDialogOpen = false;
|
||||||
|
this.sharedService.isEditDialogOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
<section>
|
||||||
|
<div class="dialog">
|
||||||
|
<div class="header">
|
||||||
|
<img src="./../../../../assets/img/logo.svg" alt="" />
|
||||||
|
<p>Edit contact</p>
|
||||||
|
</div>
|
||||||
|
<div class="content">
|
||||||
|
<div
|
||||||
|
class="circle"
|
||||||
|
[ngStyle]="{
|
||||||
|
'background-color': userService.getUserDetails(
|
||||||
|
sharedService.currentUserId,
|
||||||
|
'color'
|
||||||
|
)
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
<div class="initials">
|
||||||
|
{{
|
||||||
|
userService.getUserDetails(sharedService.currentUserId, "initials")
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form">
|
||||||
|
<app-contact-form></app-contact-form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
section {
|
||||||
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dialog {
|
||||||
|
background-color: var(--white);
|
||||||
|
width: 760px;
|
||||||
|
height: 500px;
|
||||||
|
border-radius: 26px;
|
||||||
|
border: 2px solid rgba($color: #000000, $alpha: 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
background-color: var(--bgSidebar);
|
||||||
|
height: 72px;
|
||||||
|
padding: 24px;
|
||||||
|
border-top-left-radius: 24px;
|
||||||
|
border-top-right-radius: 24px;
|
||||||
|
color: var(--white);
|
||||||
|
img {
|
||||||
|
width: 54px;
|
||||||
|
height: 66px;
|
||||||
|
}
|
||||||
|
p {
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 61px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
min-height: 332px;
|
||||||
|
padding: 24px;
|
||||||
|
.circle {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 120px;
|
||||||
|
height: 120px;
|
||||||
|
border-radius: 100%;
|
||||||
|
border: 2px solid var(--white);
|
||||||
|
.initials {
|
||||||
|
font-size: 47px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--white);
|
||||||
|
text-shadow: 1px 1px 2px var(--black);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ContactEditComponent } from './contact-edit.component';
|
||||||
|
|
||||||
|
describe('ContactEditComponent', () => {
|
||||||
|
let component: ContactEditComponent;
|
||||||
|
let fixture: ComponentFixture<ContactEditComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ContactEditComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(ContactEditComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
import { Component, Input } from '@angular/core';
|
||||||
|
import { ContactFormComponent } from '../contact-form/contact-form.component';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { UserService } from '../../../services/user.service';
|
||||||
|
import { SharedService } from '../../../services/shared.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-contact-edit',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule, ContactFormComponent],
|
||||||
|
templateUrl: './contact-edit.component.html',
|
||||||
|
styleUrl: './contact-edit.component.scss',
|
||||||
|
})
|
||||||
|
export class ContactEditComponent {
|
||||||
|
@Input() currentUserId!: string | undefined;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
public userService: UserService,
|
||||||
|
public sharedService: SharedService
|
||||||
|
) {}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
<p>contact-form works!</p>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ContactFormComponent } from './contact-form.component';
|
||||||
|
|
||||||
|
describe('ContactFormComponent', () => {
|
||||||
|
let component: ContactFormComponent;
|
||||||
|
let fixture: ComponentFixture<ContactFormComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ContactFormComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(ContactFormComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-contact-form',
|
||||||
|
standalone: true,
|
||||||
|
imports: [],
|
||||||
|
templateUrl: './contact-form.component.html',
|
||||||
|
styleUrl: './contact-form.component.scss'
|
||||||
|
})
|
||||||
|
export class ContactFormComponent {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -4,6 +4,7 @@ import { User } from '../../interfaces/user.interface';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { ActivatedRoute, RouterLink } from '@angular/router';
|
import { ActivatedRoute, RouterLink } from '@angular/router';
|
||||||
import { ContactDetailComponent } from './contact-detail/contact-detail.component';
|
import { ContactDetailComponent } from './contact-detail/contact-detail.component';
|
||||||
|
import { SharedService } from '../../services/shared.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-contacts',
|
selector: 'app-contacts',
|
||||||
|
|
@ -19,7 +20,11 @@ export class ContactsComponent {
|
||||||
showAllUsers!: boolean;
|
showAllUsers!: boolean;
|
||||||
currentUserId: string = '';
|
currentUserId: string = '';
|
||||||
|
|
||||||
constructor(public userService: UserService, private route: ActivatedRoute) {}
|
constructor(
|
||||||
|
public userService: UserService,
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
private sharedService: SharedService
|
||||||
|
) {}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.routeUserId();
|
this.routeUserId();
|
||||||
|
|
@ -30,6 +35,7 @@ export class ContactsComponent {
|
||||||
if (this.route.params.subscribe()) {
|
if (this.route.params.subscribe()) {
|
||||||
this.route.params.subscribe((params) => {
|
this.route.params.subscribe((params) => {
|
||||||
this.currentUserId = params['id'];
|
this.currentUserId = params['id'];
|
||||||
|
this.sharedService.currentUserId = params['id'];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
12
src/app/services/shared.service.ts
Normal file
12
src/app/services/shared.service.ts
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root',
|
||||||
|
})
|
||||||
|
export class SharedService {
|
||||||
|
isAnyDialogOpen: boolean = true;
|
||||||
|
isEditDialogOpen: boolean = true;
|
||||||
|
currentUserId: string = '';
|
||||||
|
|
||||||
|
constructor() {}
|
||||||
|
}
|
||||||
|
|
@ -27,7 +27,7 @@ export class HeaderComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
@HostListener('document:click', ['$event'])
|
@HostListener('document:click', ['$event'])
|
||||||
onClick(event: MouseEvent) {
|
checkOpenNavbar(event: MouseEvent) {
|
||||||
const targetElement = event.target as HTMLElement;
|
const targetElement = event.target as HTMLElement;
|
||||||
if (
|
if (
|
||||||
!targetElement.closest('app-navbar') &&
|
!targetElement.closest('app-navbar') &&
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<section>
|
<section>
|
||||||
<img class="logo" src="./assets/img/sidebar/logo.svg" alt="" />
|
<img class="logo" src="./assets/img/logo.svg" alt="" />
|
||||||
|
|
||||||
<nav>
|
<nav>
|
||||||
<div
|
<div
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Loading…
Reference in a new issue